Merge branch 'mgiuca-wx-config' into integration
authortcatm <tcatm@gawab.com>
Fri, 25 Feb 2011 23:59:55 +0000 (00:59 +0100)
committertcatm <tcatm@gawab.com>
Fri, 25 Feb 2011 23:59:55 +0000 (00:59 +0100)
commit5078a54b529f6a108cde765bd888c1603c10ac8b
tree4688af20c8b0c3669d3814d72fd669bb809050cd
parentccd7fe8de52bbc9210b444838eefb7ddbc880457
parent84711b18bc956e5900493c3722d5375758e9f584
Merge branch 'mgiuca-wx-config' into integration