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)

Trivial merge