Merge branch '2.1' into 2.2

orchestral · Jul 15, 2014 · 2f80f2c · 2f80f2c
2 parents 233b4e5 + 850b270
commit 2f80f2c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -10,5 +10,7 @@
 /.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore
 /Guardfile          export-ignore
+/build.xml          export-ignore
+/phpunit.xml        export-ignore
 /LICENSE.md         export-ignore
 /README.md          export-ignore