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)

Trivial merge