Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sat, 26 May 2012 18:53:54 +0000 (20:53 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 26 May 2012 18:53:54 +0000 (20:53 +0200)
commit4750bd214bf1748eae2e0e9125339560bc571f7b
tree837cd7448657a42817190e09c5ffdf6e138f6117
parentd4f8a6c0bf81996fe62fe1136d30c08ff6aed5c8
parentaa8e7efb37fece238663f91ed5310f941c5553f7
Merge branch 'master' into english