Project: Conozco America Repository: mainline Branch: master Author: Pootle daemon Timestamp: Sat Aug 04 04:31:49 GMT 2012 Url: http://git.sugarlabs.org/conozcoamerica/mainline/commit/6cc1abe5ccde55e98ea48acba2f4cace756c6b04 Merge branch 'master' of git.sugarlabs.org:conozcoamerica/mainline - conozcoam.py