Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 16 Dec 2015 11:13:35 +0100
changeset 28467 ba5c3ba713b0
parent 28457 17016914f029 (current diff)
parent 28466 a40d27fe8e84 (diff)
child 28468 653ed78431dc
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed Dec 16 09:05:20 2015 +0100
+++ b/.hgsigs	Wed Dec 16 11:13:35 2015 +0100
@@ -183,3 +183,4 @@
 d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ
 089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ
 d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo
+cf00bd72641cd3d41f95c0610058f127dad7b91a 0 iEYEABECAAYFAlZv7k4ACgkQCX/oGf+2qkNDIgCeO9reaQhgk94B44p24tVR/E5NsccAoOoJYRH9w6b6sWOOQkRivfVjQwSv
--- a/.hgtags	Wed Dec 16 09:05:20 2015 +0100
+++ b/.hgtags	Wed Dec 16 11:13:35 2015 +0100
@@ -194,3 +194,4 @@
 bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3
 8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4
 84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4
+f698a5f953c867f7f7fefe86d7cca3ff80324181 3.0PR15Q4.1