merge
commit2b1f42ad743094b9035ff7b2c822183c85581e87
authorStephane Wirtel <stephane@tinyerp.com>
Tue, 9 Sep 2008 13:45:02 +0000 (9 15:45 +0200)
committerStephane Wirtel <stephane@tinyerp.com>
Tue, 9 Sep 2008 13:45:02 +0000 (9 15:45 +0200)
tree15e4bf42ec5dc47a3cf479aa6f07fa9a026ccb99
parente9b12adcaf4061ea5d6c2f2593640c4f22f2c7b6
merge
[openobject-client @ stephane@tinyerp.com-20080909134502-c5fecs6t66ya7r91]
bin/modules/action/main.py
bin/modules/gui/window/win_preference.py