Merge branch 'master' into aci
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 20 Feb 2013 06:02:26 +0000 (15:02 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 20 Feb 2013 06:02:26 +0000 (15:02 +0900)

Trivial merge