Merge remote-tracking branch 'drebs-github/bug/3515_events-server-test-fails' into...
authorKali Kaneko <kali@leap.se>
Thu, 19 Sep 2013 17:02:58 +0000 (13:02 -0400)
committerKali Kaneko <kali@leap.se>
Thu, 19 Sep 2013 17:02:58 +0000 (13:02 -0400)
commit5ee3d1a21311c7798a96a344b3e3b0eb7412236d
tree3e8692aa9363d7d01f4c714ee2f86411e284e184
parentf25e9af5a9f5689fdc4b3ff009d20736ea5517d3
parentceff819d433764c303df42c00b0271084e414e4d
Merge remote-tracking branch 'drebs-github/bug/3515_events-server-test-fails' into develop