Merge branch 'hotfix/i18n-disabled_languages'
authorkristin <kristin@radicaldesigns.org>
Thu, 21 Jun 2012 05:37:38 +0000 (22:37 -0700)
committerkristin <kristin@radicaldesigns.org>
Thu, 21 Jun 2012 05:37:38 +0000 (22:37 -0700)
commit22fe3ae4ac529dc5715fb6fd217bfb40945e17df
treecd824133933299eb7e5dc831e57c0f9ae28a8942
parentc31ca701421b3ca4b44ed10cf94ae3ea936d677d
parent422f83916d9283a2f7ca0b1c40edd53d43a9e21d
Merge branch 'hotfix/i18n-disabled_languages'