Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 18 Mar 2016 09:24:44 +0100
changeset 28974 21b2b9f69f1d
parent 28962 5fcda5d6d9ca (current diff)
parent 28973 af153cecc43c (diff)
child 28975 a160b8263357
child 28976 c08c571d4338
Merge back from main
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Thu Mar 17 19:33:46 2016 +0000
+++ b/.hgsigs	Fri Mar 18 09:24:44 2016 +0100
@@ -188,4 +188,5 @@
 13daf93202e0933841632c91b1d4a887d9521e3c 0 iEYEABECAAYFAlahu2QACgkQCX/oGf+2qkPP3QCdFhiUHKeBfwEFsprfMiofZWZ1/wkAoN0Tjy/Hk2svUSV2vBYUf3uHGz+U
 24d2967df096de06913c9991553c1d84b07df9b6 0 iEYEABECAAYFAla9YYIACgkQCX/oGf+2qkNH7wCfV32iOyR/TQKzW/mH1iHTir6f6h4AoIlh4QBWIShpJqbJvx2IhfARpvUZ
 f016ea545c924ad099e9e402689035f1dd73baa2 0 iEYEABECAAYFAlbTzQoACgkQCX/oGf+2qkP28wCdFpNqpw+ODgF0p3cMJAbTZy1IPfoAoNEuRHkZIM5bNJMjwU0/GhjCtwah
+a53670f00eb6c9225829a660075fcfffa1109a1e 0 iEYEABECAAYFAlbqRpEACgkQCX/oGf+2qkN5qQCgsO1APX5AJ4cpb0oJX5vUQnvPMusAoPoDaQxGDihvsB4BSGW60RIxBdGC
 38ef1dc10aa3d6fb8210b85beab370f62a4545ca 0 iEYEABECAAYFAlbiTM0ACgkQCX/oGf+2qkNBDwCfXmKXkqNGsAsfiofYOBBdvjA/XgkAoIwLK3DkmHeM71JihwfVOWyB4hmj
--- a/.hgtags	Thu Mar 17 19:33:46 2016 +0000
+++ b/.hgtags	Fri Mar 18 09:24:44 2016 +0100
@@ -199,4 +199,5 @@
 b6c50283d4a8ae24f54c0f0955601478ead7134d 3.0PR15Q4.2
 9985680adffaf70ffcc1f560860feb10f0ee6b33 3.0PR15Q4.3
 70df4e4c5cab6d37f10eceee6b66be039c381556 3.0PR15Q4.4
+21c8ed48293c94cbe5875a8edef08aca0efd2bf4 3.0PR15Q4.5
 ee5383e071318afe8eece515b4b264cfb46c1a84 3.0PR16Q1