Merge branch 'master' into 'master'
authorMicah <micah@riseup.net>
Sat, 28 Feb 2015 16:44:30 +0000 (16:44 +0000)
committerMicah <micah@riseup.net>
Sat, 28 Feb 2015 16:44:30 +0000 (16:44 +0000)
Merge with immerda

See merge request !1


Trivial merge