From: Daniel Bachhuber Date: Sun, 11 Aug 2013 20:46:06 +0000 (-0700) Subject: Merge branch 'master' into use-gettext-taxonomy-scaffold X-Git-Tag: v0.12.0~100^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=599339300b4ac5ec32ac82fd3f2be37307769a7e;p=wvm%2Fwvm.git Merge branch 'master' into use-gettext-taxonomy-scaffold --- 599339300b4ac5ec32ac82fd3f2be37307769a7e