Merge remote-tracking branch 'drebs/feature/2696-implement-unregister-in-events-2...
authorTomas Touceda <chiiph@riseup.net>
Wed, 19 Jun 2013 17:31:49 +0000 (14:31 -0300)
committerTomas Touceda <chiiph@riseup.net>
Wed, 19 Jun 2013 17:31:49 +0000 (14:31 -0300)

Trivial merge