From: PHO <pho@cielonegro.org>
Date: Thu, 15 Dec 2011 12:49:22 +0000 (+0900)
Subject: Merge branch 'convertible'
X-Git-Tag: RELEASE-0.3~1
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=2064aacf48e193924b6ffe18a50853d233c16b98;hp=2064aacf48e193924b6ffe18a50853d233c16b98;p=time-http.git

Merge branch 'convertible'
---