Merge branch 'master' into spanish
authorMarco <marco@theanarchistlibrary.org>
Thu, 27 Dec 2012 09:46:54 +0000 (10:46 +0100)
committerMarco <marco@theanarchistlibrary.org>
Thu, 27 Dec 2012 09:46:54 +0000 (10:46 +0100)
commit578f0a65937251967335654c79ae6e9a94f017d0
treee9b4c7941ccf91d99e844ab71dd5be7af6450c61
parent170458bc70878f1d7477a371104d84c921fa6acf
parentec74645f76093287970d76d5615b3b2f135e3686
Merge branch 'master' into spanish