]> granicus.if.org Git - libevent/commitdiff
Merge branch '20_periodic_event_overload_v2' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Apr 2012 15:51:13 +0000 (11:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Apr 2012 15:51:13 +0000 (11:51 -0400)

Trivial merge