Merge branch 'master' of https://github.com/jn9999/leap_doc
authorMicah Anderson <micah@riseup.net>
Wed, 19 Nov 2014 01:12:21 +0000 (20:12 -0500)
committerMicah Anderson <micah@riseup.net>
Wed, 19 Nov 2014 01:12:21 +0000 (20:12 -0500)

Trivial merge