Merge remote-tracking branch 'github/pr/90'
authorFelix Geyer <debfx@fobos.de>
Wed, 6 May 2015 18:53:56 +0000 (20:53 +0200)
committerFelix Geyer <debfx@fobos.de>
Wed, 6 May 2015 18:53:56 +0000 (20:53 +0200)
commit94111c36623129293f17c6d0f935bbaa2e0971f1
treea554bf004cc005c140abc1bddf5c9d841c0ddf60
parente41bf008e98d51df93ede39609abab0776f657b5
parent3fca61dc243a9bf7b2e088f3b4c7476c48d88312
Merge remote-tracking branch 'github/pr/90'

https://github.com/keepassx/keepassx/pull/90