Merge tag 'upstream/1.31.1' into tizen_base 13/183513/2 accepted/tizen_5.0_base tizen_5.0_base accepted/tizen/5.0/base/20181101.090746 accepted/tizen/base/20180713.194607 submit/tizen_5.0_base/20181101.000001 submit/tizen_base/20180709.071535
authorSeonah Moon <seonah1.moon@samsung.com>
Fri, 6 Jul 2018 06:19:23 +0000 (15:19 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Fri, 6 Jul 2018 06:20:02 +0000 (15:20 +0900)
commit51f41c18da0627cd0e4a63dbf43380cfe5d3a86f
tree62a2b289426e5b36869ed34f5a55b797ad63fbe5
parent90e3d964ded39c88e7aa961c82c8e9da2d0b8bfb
parent321662bde5e3fd200476f9570c1fd04ed3c5673b
Merge tag 'upstream/1.31.1' into tizen_base

Change-Id: I26aa3e9d402e19bc53195f0c1a4b714fa6ce3a43
packaging/nghttp2.spec