Merge remote branch 'github-bgk/3.12.14-translate' into HEAD
authorKyle M Hall <kyle@bywatersolutions.com>
Fri, 25 Jul 2014 16:39:16 +0000 (12:39 -0400)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 25 Jul 2014 16:39:16 +0000 (12:39 -0400)
commitd84f7b0869070399e3473ff55776ef9660935023
treeb1e7c28c0bbaf76cf0273283c52f15d494f4c664
parent93b1f13ce0a1c39b37306ca1c6e6b05090fa4db4
parent0d2fe4755539b0c9a29b104858824a8c4040fa88
Merge remote branch 'github-bgk/3.12.14-translate' into HEAD