Merge branch 'devel' into messages
authorMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:25:43 +0000 (15:25 +0200)
committerMarek Marecki <marekjm@taistelu.com>
Sat, 24 Aug 2013 13:25:43 +0000 (15:25 +0200)
commit6e4998371d7b94c4d137f5d1406e209943daadad
tree1be3aae6469db1fba7eb52cca17525ba30dec919
parent66e4433420797d5591d3199a496e0c462c546ccd
parentb4da66ad9d2f0a5182b173c1d81e8c6e36925c08
Merge branch 'devel' into messages
diaspy/__init__.py