Merge remote-tracking branch 'github/pull/52'
authorTom Hughes <tom@compton.nu>
Tue, 19 Jan 2016 10:08:41 +0000 (10:08 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 19 Jan 2016 10:08:41 +0000 (10:08 +0000)
commit201e201e39365fa4947d2db4200a9cbeb482a1cd
treeba8d242f18ca703c9be7c215e3806c043e2d0f68
parent8e8c8f5556636d6369feb3c6ef7f05b93e39e763
parentf09d0fffb785d170d9e13d06b334181cb3a45f8a
Merge remote-tracking branch 'github/pull/52'