Project: conozcoamerica Repository: mainline Branch: master Author: Pootle daemon Timestamp: Sat Apr 14 08:03:47 GMT 2012 Url: http://git.sugarlabs.org/conozcoamerica/mainline/commit/cded283dcc3039b9ec515cf283c26e442cc9028e Merge branch 'master' of git.sugarlabs.org:conozcoamerica/mainline