Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 05 Sep 2014 19:32:35 +0200
changeset 24404 c566bcdd3071
parent 24386 1cd910378ea1 (current diff)
parent 24403 2793ea345b2d (diff)
child 24405 9d3377dd39d4
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Fri Sep 05 12:51:58 2014 +0000
+++ b/.hgsigs	Fri Sep 05 19:32:35 2014 +0200
@@ -154,3 +154,4 @@
 9607751357e9e3a411c0919759ed81196befcad9 0 iEYEABECAAYFAlPHZVkACgkQCX/oGf+2qkORBQCfZJPiBWcEMNURibADGn9o+u+snwgAoP4ZMSkLCsu4PSf75rZn4gStM4wh
 11ed6ecc0a194545a1f8a3af2b2674b0ec319f99 0 iEYEABECAAYFAlPblXoACgkQCX/oGf+2qkOuxACfX5e+wRgLJw88VUyHl32C+QC8PY8AoOoARsJUAOnu8IgYYwNjyw5xMlKC
 a9d6608b6cabe9e27fa31cbf2a49a69b2d583e0a 0 iEUEABECAAYFAlPfOfMACgkQCX/oGf+2qkP8GQCY8T/ZXMymIqGubZ6h2LbjE7Uc4gCg5A/numsq2gypnrNri+wMt1HLLWA=
+c63d4e4125e832602ed1da786f756c26c7fdcd2a 0 iEYEABECAAYFAlQISYIACgkQCX/oGf+2qkMciwCgo6ZYlA+XmT9DC0n2zO7P5okbQngAoITq7wESNiiLk56/3Rzw7gGtOgMe
--- a/.hgtags	Fri Sep 05 12:51:58 2014 +0000
+++ b/.hgtags	Fri Sep 05 19:32:35 2014 +0200
@@ -165,3 +165,4 @@
 73f3bc31a2293109ebdc6e5b2f8b3f1870df7528 3.0PR14Q2.4
 abfe5a20ef579b8edaf9866346ee876a00e87eee 3.0PR14Q2.5
 d7d2abe0f424775dcdf9139410ae161881be1fb8 3.0PR14Q3
+a5483762bc5de5e3e934785f3baffda3a2d96db2 3.0PR14Q3.1