rebase
authorkk6 <kekelo1603@gmail.com>
Thu, 27 Mar 2014 16:48:40 +0000 (01:48 +0900)
committerkk6 <kekelo1603@gmail.com>
Thu, 27 Mar 2014 16:48:40 +0000 (01:48 +0900)

Trivial merge