Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 13:52:04 +0000 (15:52 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 6 May 2012 13:52:04 +0000 (15:52 +0200)
commit6726ae35b2d4f34c29ea397368879629d9e1658d
tree93c61543b4f5fecc0514c9c6738d43f8ad32493d
parent24d02c45d362f6d34039bb8d4fcbf0fe0e5efed7
parent9eb147e3b8f084dfd140aa2dca4f43914bb09b9a
Merge branch 'master' into english