merge
authorfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:45:12 +0000 (18:45 +0200)
committerfp <fp@fp-laptop>
Sat, 17 Sep 2011 16:45:12 +0000 (18:45 +0200)
commitc014b3dd0b55df137bc769dafd776c5d4633d259
tree5756609adc52ac9438936fe81226d1a971e5247c
parent95d3af021df269c976ecedcbb07a0f94838984e7
parent13144fbdd8f7ae407975ceed0a00b9ba0c10d6e5
merge

bzr revid: fp@fp-laptop-20110917164512-8fca333wk2rp5ulu
addons/base_setup/base_setup_views.xml