Merge branch 'vendor/DIALOG'
authorJohn Marino <draco@marino.st>
Wed, 4 Nov 2015 15:56:22 +0000 (16:56 +0100)
committerJohn Marino <draco@marino.st>
Wed, 4 Nov 2015 15:56:22 +0000 (16:56 +0100)
commitf94f91937c943a73868490b7871ed921ad9dacc2
tree545eb011e8e6019194e2b1c7f62e4952851a58a6
parent95132702cde2b9f2877bb72433c4a6b6eae2d985
parent1ef6786a82740cc37b76bd775bf8fa8049158699
Merge branch 'vendor/DIALOG'