From: Adam <redacted>
Date: Fri, 8 May 2015 22:11:18 +0000 (-0400)
Subject: Merge remote-tracking branch 'gl/master'
X-Git-Url: https://jfr.im/git/irc/rizon/acid.git/commitdiff_plain/20b6cae8d7628aca783675c8edc516c0b2fab6b2?hp=20b6cae8d7628aca783675c8edc516c0b2fab6b2

Merge remote-tracking branch 'gl/master'
---