Merge branch 'master' into settings
authorMarek Marecki <marekjm@taistelu.com>
Thu, 11 Jul 2013 23:33:57 +0000 (01:33 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Thu, 11 Jul 2013 23:33:57 +0000 (01:33 +0200)
commit9e470d5b6b15633f26d051d5a39d4b08dc55a988
treed2bbe954b388ca8b44524da57b72faf5249f7232
parentc6c10c6d71844b293b35c5e024d6a33e1803a02f
parentcf0105fb68805af228e421c17610e2a096826c56
Merge branch 'master' into settings
diaspy/__init__.py