From: yuki <kimaira7@gmail.com>
Date: Fri, 10 May 2013 10:43:08 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: version0.1.2~2^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f65e9af6d5b726319a60ef2d41fa46e8f25a5db6;p=neighbornote%2FNeighborNote.git

Merge remote-tracking branch 'origin/develop' into develop
---

f65e9af6d5b726319a60ef2d41fa46e8f25a5db6