Merge remote-tracking branch 'sourceforge/patches-2.0' into patches-2.0 Conflicts: include/event2/event.h
2013-12-20T13:37:04