[MERGE] file_open: give precedence to directory before zip, courtesy of Florent Xicluna
authorOlivier Dony <odo@openerp.com>
Mon, 3 Sep 2012 13:05:36 +0000 (15:05 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 3 Sep 2012 13:05:36 +0000 (15:05 +0200)
commit869564ce28c976765d76ae2a33e2dbb3c8f69534
tree3e6ea5b31e53455870320c5c83c35de524dd2be8
parentf29be675e2b63a85c0e2d1032fb448dc9714b6a4
parent9769884ca5fd897aac95174d751d65bcefd936b3
[MERGE] file_open: give precedence to directory before zip, courtesy of Florent Xicluna

lp bug: https://launchpad.net/bugs/928376 fixed
lp bug: https://launchpad.net/bugs/928507 fixed

bzr revid: odo@openerp.com-20120903130536-5sqwp9tnhk1ntee3
openerp/modules/module.py
openerp/tools/misc.py