[MERGE] merge from trunk addons
authorMustufa Rangwala <mra@mra-laptop>
Wed, 29 Sep 2010 13:35:00 +0000 (19:05 +0530)
committerMustufa Rangwala <mra@mra-laptop>
Wed, 29 Sep 2010 13:35:00 +0000 (19:05 +0530)
commit7959ca299ac4e87c9126e1eb365150381bb1d469
tree2508a1824c3985a74570a19e441fb94496db6f2c
parent94b5911bb858274ea42179eec9601bf0e7fc69bd
parenta00ba7134ce62a498c31b0807ede996955f5b5a7
[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100929133500-fou24no57ea6a937
addons/account/account_view.xml
addons/account_voucher/account_voucher_view.xml