Merge remote-tracking branch 'i18n/master'
authorPatrick Aljord <patcito@gmail.com>
Thu, 5 May 2011 21:16:03 +0000 (16:16 -0500)
committerPatrick Aljord <patcito@gmail.com>
Thu, 5 May 2011 21:16:03 +0000 (16:16 -0500)
commit0f98414a2e27014eea93483d2f85872b0f7c09bf
tree3275c08d73d08ae33a59cd2a955c217262b7e6b2
parent58cc518bcd7858feb5b820997a7b8aa226961115
parentfd99ff821ec050c2617b6da276cbce13e0c973a5
Merge remote-tracking branch 'i18n/master'