Merge branch 'master' into russian
authorMarco <marco@theanarchistlibrary.org>
Sun, 20 May 2012 16:40:03 +0000 (18:40 +0200)
committerMarco <marco@theanarchistlibrary.org>
Sun, 20 May 2012 16:40:03 +0000 (18:40 +0200)
commit692f5da2d8ab05193c35bcd1479e5e5c638bfcae
tree64f46610db259e287c8659fc5265334353f529e4
parentadb9ba3966874380e1ef89e630d0366ba59ef5f7
parent185398bd5601c23254f5000061f1c1f7066c95fc
Merge branch 'master' into russian