Merge remote branch 'github-bgk/3.12.12-translate' into HEAD
commit8ce79e9285bd9347d2ff8cdf9e54bce0b89665ff
authorKyle M Hall <kyle@bywatersolutions.com>
Mon, 23 Jun 2014 14:07:44 +0000 (23 10:07 -0400)
committerKyle M Hall <kyle@bywatersolutions.com>
Mon, 23 Jun 2014 14:07:44 +0000 (23 10:07 -0400)
treedc064e0790f9207b665963d1c22baa075bcb0b8d
parentdceb59baead1db3b780535f78fa87559daacfac3
parente9a146dbc6d2c9616fb655b2b9c4b4b6faf02da2
Merge remote branch 'github-bgk/3.12.12-translate' into HEAD