Merge remote branch 'i18n/master' master
authorPatrick Aljord <patcito@gmail.com>
Thu, 11 Nov 2010 17:36:32 +0000 (12:36 -0500)
committerPatrick Aljord <patcito@gmail.com>
Thu, 11 Nov 2010 17:36:32 +0000 (12:36 -0500)
commitd2d52a782a129a32f32ce5b2151da9c4641f9742
treee3e8893c1167ccbd9813b1069167c85eeb981a9b
parent1320bb12530d9ae0c53c87afba142a6c098532bc
parentbaafcc0e8774b8726e4589fbb6f53885b01abf8e
Merge remote branch 'i18n/master'