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)
commitbf746f2f9caacd869a252c7f09cde93c0e577e09
treee7c2d4161b529967079d20ff4f81e5c118cf1a67
parentac5da1df281e636ecffe260b681e8119a1057e1d
parentc6beeb1718608389e027d287c7a8ddd586313df2
Merge branch 'master' into 'master'

Merge with immerda

See merge request !1