Merging from the Server Action Development
authormga@tinyerp.com <>
Mon, 25 Aug 2008 13:15:43 +0000 (18:45 +0530)
committermga@tinyerp.com <>
Mon, 25 Aug 2008 13:15:43 +0000 (18:45 +0530)
bzr revid: mga@tinyerp.com-20080825131543-3prhvmmc0rrwha2p

1  2 
bin/addons/base/ir/ir_actions.py

Simple merge