Merge remote-tracking branch 'github/pr/82'
authorFelix Geyer <debfx@fobos.de>
Tue, 14 Apr 2015 21:07:14 +0000 (23:07 +0200)
committerFelix Geyer <debfx@fobos.de>
Tue, 14 Apr 2015 21:07:14 +0000 (23:07 +0200)
commit6411b9bd6639f227e4df339c71d85b0c5acf7d04
tree5aa50f3d0451564050b158165a83121564569aaa
parentcf0bc32b2701168fd2a6749605a75676ec62184f
parent00df73ced093b74b3e49c736e020d20ac1c54a32
Merge remote-tracking branch 'github/pr/82'

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

Closes #145