Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 28 Jan 2013 06:15:40 +0100
changeset 19466 679181dff0eb
parent 19465 6075f911fafd (current diff)
parent 19464 6509e1818395 (diff)
child 19467 a7a8c478cb9c
child 19479 d000753ca50c
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Sun Jan 27 11:33:51 2013 +0100
+++ b/.hgsigs	Mon Jan 28 06:15:40 2013 +0100
@@ -97,6 +97,7 @@
 73102dce4ea86f1b3fab97709f1832f39f89d227 0 iEYEABECAAYFAlDYYXMACgkQCX/oGf+2qkNpJQCg09+Ojgco2TaKN6BlNC4888yhLCgAoJfCfQ/93ePShFci2Fic/lzeg/wL
 1b9cd3d88a74c309ec1f97f4cf93ca161e1d6e7f 0 iEYEABECAAYFAlDvi2QACgkQCX/oGf+2qkMOhwCgvmcBpIUpUJH8otzrM3ZOu8uUgFEAoIdvXKVCLQKM5znHtX9Il/HJgzxO
 0de4d6a8de6d8676576cd03417b6e3cab9a7b78d 0 iEYEABECAAYFAlD+H7EACgkQCX/oGf+2qkMMSwCbBFZ24/VJnVdauBgZ4gIebPe9tB8AnA9F03aZPEkc27RXoFC7NfVSxt3B
+4201e035fbb94a70658677a3a855a5f960b559a3 0 iEYEABECAAYFAlECHJUACgkQCX/oGf+2qkOnZwCeP3IgJ+UTipTNbcXQF+036cn/bpEAn1VZ8c7IaxE3b+9nfEqd4zmi7MB9
 21ee53026babfbaa1acea42273889c2d292eb5b6 0 iEYEABECAAYFAlD2CwAACgkQCX/oGf+2qkMs8QCePue6nyUSbeurM9ltNo/cb3k0vA0An2JJzndMdd/1MAurX6DfEGCTo9Uj
 9fe1637c98a6cc490582445af850cc06b3e34a8e 0 iEYEABECAAYFAlD39dUACgkQCX/oGf+2qkMB5gCg/czNu6dng2nZxXKFiyTiuXHl0/IAoPKktgGNoj8crEuTaYuCrpYCtLTA
 b495316d385b5256fb3384d0c00d05e6e2eacf18 0 iEYEABECAAYFAlD/hhQACgkQCX/oGf+2qkNLsQCg5D7WvT3vF3tzs+LFk/nUZ6tSKHgAnjxJmaE7z0f0LWCD+ejguy0eDBJf
--- a/.hgtags	Sun Jan 27 11:33:51 2013 +0100
+++ b/.hgtags	Mon Jan 28 06:15:40 2013 +0100
@@ -108,6 +108,7 @@
 26a81bd13b9118ce8591e58ed7d04533469708f0 3.0MP18.1
 f4f500d33fc0161856f8e4b0ed737053f318313d 3.0MP18.2
 4023ea37e5619c3cd75559e1795a2609a5f97088 3.0MP18.3
+3c63dd432336e7f250c5ca2fc78b95f87ecd39b4 3.0MP18.4
 f6d77303909a01da297ca96e5c23f8de1106eb0b 3.0MP19
 964842f76d10b1752cfa63b69c370deb668abe4c 3.0MP19.1
 aaf6f469e183fe0ecaacc003f08d7c1879e64357 3.0MP19.2