Merge remote-tracking branch 'origin/develop' into develop

orientechnologies · Sep 4, 2015 · 01f2afd · 01f2afd
2 parents 33dc4c6 + 5913332
commit 01f2afd
Showing 1 changed file with 0 additions and 21 deletions.
diff --git a/.travis-settings.xml b/.travis-settings.xml