Merge branch 'master' into english
authorMarco <marco@theanarchistlibrary.org>
Sun, 10 Mar 2013 18:21:31 +0000 (19:21 +0100)
committerMarco <marco@theanarchistlibrary.org>
Sun, 10 Mar 2013 18:21:31 +0000 (19:21 +0100)
commit4679748043af67a0455139d719b60eb591bef0a0
tree917f436c55c2d9ea262424e3d89bc1814ae13380
parentc996c0cd1623517fcfded41c9fe314546bcade5e
parentb5ee129a6bff91bce0edc7f9f5abae7ea5808ee8
Merge branch 'master' into english

Conflicts:
AmuseWiki/config.yml
AmuseWiki/config.yml