OSDN Git Service

Merge branch 'master' into export-api
authorscribu <mail@scribu.net>
Fri, 5 Jul 2013 17:44:43 +0000 (19:44 +0200)
committerscribu <mail@scribu.net>
Fri, 5 Jul 2013 17:44:43 +0000 (19:44 +0200)
commit2d460dd705aa1b233db719deee4edf2dccde26d6
treee16d9191e1575fa940ead7968982eed5b49ac04f
parent2fad5359a341b2ace85341e9a673c9155757370e
parentfbaab7151f5a91dce34c6915db80ec05b7bdc941
Merge branch 'master' into export-api