tree b1bc52b6aaea668246ff61bd77921d7609853896
parent c31ed40c1b5b4d5cad261b47d38968e22c15039a
parent c494e36d363c30fd02fa1b67ada22e302a924463
author Jacques Le Roux <jleroux@apache.org> 1391537034 +0000
committer Jacques Le Roux <jleroux@apache.org> 1391537034 +0000

Merges trunk HEAD

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/webhelp-2012-12-07@1564402 13f79535-47bb-0310-9956-ffa450edef68