From: yuki <kimaira7@gmail.com>
Date: Wed, 3 Jul 2013 04:37:30 +0000 (+0900)
Subject: Merge branch 'develop'
X-Git-Tag: version0.2^0
X-Git-Url: http://git.sourceforge.jp/view?p=neighbornote%2FNeighborNote.git;a=commitdiff_plain;h=190ad986c47eee9b928b9e4ebbfc6fd45c7e155c

Merge branch 'develop'
---

190ad986c47eee9b928b9e4ebbfc6fd45c7e155c