Merge branch 'github-pr-104'
authorJames Le Cuirot <chewi@gentoo.org>
Tue, 29 Sep 2015 21:18:47 +0000 (22:18 +0100)
committerJames Le Cuirot <chewi@gentoo.org>
Tue, 29 Sep 2015 21:20:04 +0000 (22:20 +0100)
commitfb02e66bc65eec9a23ec9e6720356dadacdb3c02
treeb2c4d0c994b0268a48635f27c706317913cb779d
parent0526c7257b1e02b869e530a0114475818683ddbc
parentd60fe8603d215863739ca87c26ef00880b715152
Merge branch 'github-pr-104'