Merge branch 'master' into settings
authorMarek Marecki <triviuss@gmail.com>
Sat, 6 Jul 2013 10:33:23 +0000 (12:33 +0200)
committerMarek Marecki <triviuss@gmail.com>
Sat, 6 Jul 2013 10:33:23 +0000 (12:33 +0200)
commitc6c10c6d71844b293b35c5e024d6a33e1803a02f
tree7bad7f6d5a675f377b9603998068262f7f0e9c95
parentfb680551ae25f637c1f0e8695b2b39a6259196ce
parent240a85ae28946f1229497ba7a935e05c0a096996
Merge branch 'master' into settings

Conflicts:
diaspy/__init__.py
diaspy/__init__.py
diaspy/settings.py