Merge remote-tracking branch 'origin/3.0.x' into 3.0.x

This commit is contained in:
Gautier Pelloux-Prayer 2015-11-30 17:37:45 +01:00
commit b03a8458ee
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit d490f9a8b159ee90486c07576425c87af0fb3862
Subproject commit 32a622036d044f732b85e059d23a4955adab9073

@ -1 +1 @@
Subproject commit 3f516c5238d0c536ea03c8e5334d231facf9f31b
Subproject commit 1840d2a6de0e832d5c770e0810bcaf5c5ca7a7ff