[Pootle-commits] [Gitorious] Commit to [Conozco America] by [] for []

[Gitorious]

Project:    Conozco America
Repository: mainline
Branch:     master

Author:     Pootle daemon
Timestamp:  Sun Sep 02 04:32:22 GMT 2012
Url:        http://git.sugarlabs.org/conozcoamerica/mainline/commit/8c2e4d2d7478c58417aa706c6c685e23ced2fb01

Merge branch 'master' of git.sugarlabs.org:conozcoamerica/mainline

- activity.py
- conozco.py
- conozcoam.py
- recursos/comun/datos/commons.py