]> granicus.if.org Git - libevent/commitdiff
Merge branch 'master' of ssh://github.com/libevent/libevent
authorNick Mathewson <nickm@torproject.org>
Thu, 28 Jun 2012 15:42:25 +0000 (11:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Jun 2012 15:42:25 +0000 (11:42 -0400)

Trivial merge