Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sat, 21 Apr 2012 16:12:23 +0000 (18:12 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sat, 21 Apr 2012 16:12:23 +0000 (18:12 +0200)
commitad16356c6a0e5bfe2e35a6d41f99594475ed845e
tree1f405f6e2b8e4a6a438940995f4aafa966d96033
parenta6b8f2a486266bc68f73b2469db54acd1cfc8c37
parent0c6e696c16c1d90090da85151d3c43cfef26f5e6
Merge branch 'master' into russian