[FIX] oe: listing of modules only take directories having a __openerp__.py file
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5125 rev-id: dle@openerp.com-20131112130412-mbdonb9g7n63w84r
Launchpad automatic translations update.
[MERGE] forward port of branch 7.0 up to revid 5128 launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
[MERGE] forward port of branch saas-1 up to revid 4918 chs@openerp.com-20131114134731-n324awyon0spq624
Merge branch 'master' of bzr::lp:~openerp/openobject-server/saas-2 into ocb-saas-2