Merge branch 'master' into renew-documents
authorj8takagi <j8takagi@nifty.com>
Thu, 1 Nov 2012 10:02:09 +0000 (19:02 +0900)
committerj8takagi <j8takagi@nifty.com>
Thu, 1 Nov 2012 10:02:09 +0000 (19:02 +0900)
commit3242e69dd21cc00458447c231ef63f876ea54ad1
treea37953be7454cb88aea9fae7bfca6e6dc8a9d5f1
parentd43606faa394e4604ec23d1817ee6358b845e038
parent41f1dda7d2455c969285b2780528c1bbc4cbe951
Merge branch 'master' into renew-documents