Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 10 Dec 2015 07:11:19 +0100
changeset 28116 ef24b25b675a
parent 28115 d6dee04db30b (current diff)
parent 28114 e7c7b008c3fb (diff)
child 28117 817244721987
child 28118 0eb0853e3d48
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed Dec 09 20:36:31 2015 +0000
+++ b/.hgsigs	Thu Dec 10 07:11:19 2015 +0100
@@ -181,4 +181,5 @@
 f8b98762376a89ec93a0a623c61fdab00975c3a9 0 iEYEABECAAYFAlXtQ4gACgkQCX/oGf+2qkMZUgCePOnen6iguLqaG+86NeCC8Hr0yzAAoKTnw/BIXyBm5Ski5JQT/0mF1zHK
 9755d00af209f39887eba34a08922463fbcdac91 0 iEYEABECAAYFAlYt2zgACgkQCX/oGf+2qkN1KgCg6tzAQat0ZJJIWeFyr6yLRVCvh24AnjVyPbFPvbJ3/EOgUHtJWz5lWzeM
 d20a396ffa245fd3cdbadc3196df3554018d2e20 0 iEYEABECAAYFAlY4SL4ACgkQCX/oGf+2qkOjJACfS1q37UfrWobml4IVCOKqGeV+CU0An3iRcDJJ+N3aJMuzjkZh8xYe0mRQ
+089152094fe394f987fa18606cba401cc20283ec 0 iEYEABECAAYFAlZmVhkACgkQCX/oGf+2qkOFxgCaA0tF7KBDttIBpX4Iezn3GPqSqJQAoIO5TQRfs/Gpwo/lV48IaAIG94vJ
 d2c765a228d83098cc5f253cdd364abdb4a4697e 0 iEYEABECAAYFAlZOorMACgkQCX/oGf+2qkMFfwCgocaX6vsWuoGtE55aoHgBD1/7OKoAoOv4J31+P+8BtkVHJyKLhxGVBoLo
--- a/.hgtags	Wed Dec 09 20:36:31 2015 +0000
+++ b/.hgtags	Thu Dec 10 07:11:19 2015 +0100
@@ -192,4 +192,5 @@
 e5863950c81de2bcf7dce57035094e96d544a9ae 3.0PR15Q3.1
 9320a67a9ef1cafb5076d06bdd6d716abc662c40 3.0PR15Q3.2
 bce57079bd436cec545edb6c12246170862f0416 3.0PR15Q3.3
+8dabadcfecebf5aced31ed98411517afcb10d792 3.0PR15Q3.4
 84cd25c33900a44c955c5a899e570281f02e0ccc 3.0PR15Q4