Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Mon, 15 Sep 2014 18:55:46 +0000 (14:55 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Mon, 15 Sep 2014 18:55:46 +0000 (14:55 -0400)
commitb3774d8774dee89b6d788575bc37dbef69ec51a5
treed319e50d5781d4389d9d54a80b0347c759bfea93
parentf47cc4d06d19ea29d46fd7978aaaca7e75f7c0ca
parent188c89e7fb8230bec067741991ffa06df884b159
Merge branch 'master' of vcs.fsf.org:libreplanet-static