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)
Conflicts:
.gitignore
src/leap/common/__init__.py


Trivial merge