Merge branch 'master' of ssh://leap.se/leap_doc
authorelijah <elijah@riseup.net>
Thu, 22 May 2014 22:26:00 +0000 (15:26 -0700)
committerelijah <elijah@riseup.net>
Thu, 22 May 2014 22:26:00 +0000 (15:26 -0700)

Trivial merge