Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
authorZak Rogoff <zak@fsf.org>
Fri, 4 Oct 2013 17:14:28 +0000 (13:14 -0400)
committerZak Rogoff <zak@fsf.org>
Fri, 4 Oct 2013 17:14:28 +0000 (13:14 -0400)
commit6cc3cc124e02be9594356be4ec097188ab5318cd
tree40143d565050c4f6aa39b1d47ffce278bd34a905
parentd748469f74f2f0a1d72bc3d5e4b03105d9abedde
parent00a85a99552fd09514bb0a41139d66b3370e5fc3
Merge branch 'stable' of vcs.fsf.org:libreplanet-static into stable
2014/anti-harassment/index.html
2014/javascript/index.html
server/staging/lpc14/index.html