Project: Conozco America Repository: mainline Branch: master Author: Pootle daemon Timestamp: Sun Jul 22 04:32:42 GMT 2012 Url: http://git.sugarlabs.org/conozcoamerica/mainline/commit/4b9dfb51dc6a9ea204b62ec478db5d978a9741f5 Merge branch 'master' of git.sugarlabs.org:conozcoamerica/mainline - conozcoam.py