Albert Santoni 6ca0e340a4 Merge branch '2.5.x-installer' into saas-installer-albert ... Conflicts: python_apps/pypo/pypo/pypofile.py		2015-05-22 18:26:16 -04:00
..
application	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 18:26:16 -04:00
build	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00
library	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00
locale	Merge branch '2.5.x' into saas	2015-05-11 11:08:52 -04:00
public	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00
tests	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00