Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
authorLibby <libby@allium.(none)>
Wed, 29 Jan 2014 17:35:13 +0000 (12:35 -0500)
committerLibby <libby@allium.(none)>
Wed, 29 Jan 2014 17:35:13 +0000 (12:35 -0500)

Trivial merge