]> granicus.if.org Git - libevent/commitdiff
Merge remote-tracking branch 'rosslagerwall/python2-2.0' into patches-2.0
authorNick Mathewson <nickm@torproject.org>
Fri, 26 Oct 2012 23:36:44 +0000 (19:36 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 26 Oct 2012 23:36:44 +0000 (19:36 -0400)

Trivial merge