Tatsuhiro Tsujikawa db4a68454a Merge branch 'master' into v1.0.0 ... Conflicts: lib/includes/nghttp2/nghttp2.h		2015-04-24 00:13:15 +09:00
..
nghttp2	Merge branch 'master' into v1.0.0	2015-04-24 00:13:15 +09:00
Makefile.am	Replace HTTP/2.0 with HTTP/2	2014-03-30 19:26:37 +09:00