OSDN Git Service

Merge branch 'master' into use-gettext-taxonomy-scaffold
authorDaniel Bachhuber <d@danielbachhuber.com>
Sun, 11 Aug 2013 20:46:06 +0000 (13:46 -0700)
committerDaniel Bachhuber <d@danielbachhuber.com>
Sun, 11 Aug 2013 20:46:06 +0000 (13:46 -0700)

Trivial merge