Merge remote-tracking branch 'github/pr/125'
authorAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 26 Sep 2015 20:57:46 +0000 (22:57 +0200)
committerAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 26 Sep 2015 20:57:46 +0000 (22:57 +0200)

Trivial merge