Merge remote-tracking branch 'drebs/feature/events-signals' into develop
authorTomás Touceda <chiiph@leap.se>
Tue, 2 Apr 2013 13:48:41 +0000 (10:48 -0300)
committerTomás Touceda <chiiph@leap.se>
Tue, 2 Apr 2013 13:48:41 +0000 (10:48 -0300)
commit138def37372c44815ebc6e8cdb117e1158044d8e
treee6085b25f0372ed20b0112420ddb0a26b5d34d92
parent20c2b8986df3451d9d1f9e45a266731805f564b6
parent9b5a6961a5662edf11ecee36caa5accbbda0281d
Merge remote-tracking branch 'drebs/feature/events-signals' into develop

Conflicts:
.gitignore
src/leap/common/__init__.py