Merge branch 'master' of https://github.com/Faldrian/diaspy into Faldrian/master
authorMarek Marecki <marekjm@taistelu.com>
Sat, 11 Jan 2014 22:55:20 +0000 (23:55 +0100)
committerMarek Marecki <marekjm@taistelu.com>
Sat, 11 Jan 2014 22:55:20 +0000 (23:55 +0100)
commit866f03de124e47596deef2c0763b40ea168e6c1b
treeeeed8b9a8b7fb0753022b8021597c6100800712a
parent03ffc9ea490ec24b04d30ebf2f70bd030fb95398
parent98f9386fdb3f0daaf776a54e9c340a49d3dccb74
Merge branch 'master' of https://github.com/Faldrian/diaspy into Faldrian/master