Merge remote-tracking branch 'github/pr/260'
authorJason Zaman <perfinion@gentoo.org>
Tue, 27 Oct 2015 12:18:33 +0000 (20:18 +0800)
committerJason Zaman <perfinion@gentoo.org>
Tue, 27 Oct 2015 12:20:04 +0000 (20:20 +0800)
commit73cb025a690e48db51586986926628296488627b
tree1b87eb5a37300139d4dc1ae73807a4883e3c9b60
parent484efcdc69187f3d4ff7e409bbf5e4e42ab78abd
parent68094515e99d372640000f147c958f3e6470322c
Merge remote-tracking branch 'github/pr/260'