Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
authorZak Rogoff <zak@fsf.org>
Fri, 10 Jan 2014 20:46:58 +0000 (15:46 -0500)
committerZak Rogoff <zak@fsf.org>
Fri, 10 Jan 2014 20:46:58 +0000 (15:46 -0500)
commit7f5d4daf6a87049a3ffcf8308ca8deebe3f19665
treec0135f64b5bb3b22bf9f7a8e21af8936b259ee05
parent7f68723f95d0ca4924cb4a77dde276adf5c7f626
parent29964bcf1e54da2dc42f2ef2a3c50689e25d35b4
Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable