Merge remote-tracking branch 'origin/pr/1216'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:36:19 +0000 (23:36 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:36:19 +0000 (23:36 +0200)
commitaab7074831a2f67d9c7df8c72dd054f6cd7ddc27
treea19d1fa6cc545e4cdf76f544b894599149008fc6
parent3348ace2cdd95bc1de5e28d11f3999cf5bd4ebf4
parent168347a19eaa504f435236aaed691db901bd6114
Merge remote-tracking branch 'origin/pr/1216'