Merge branch 'master' into v0.1

Tom Van Herreweghe · Tom Van Herreweghe · commit d7cbee52a8f9 · 2013-06-19T14:55:25.000+02:00
diff --git a/README.md b/README.md
@@ -1 +1,2 @@
-[![Build Status](https://travis-ci.org/Miljar/php-exif.png)](https://travis-ci.org/Miljar/php-exif)
+Master: [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=master)](https://travis-ci.org/Miljar/php-exif)
+v0.1: [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=v0.1)](https://travis-ci.org/Miljar/php-exif)

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-[![Build Status](https://travis-ci.org/Miljar/php-exif.png)](https://travis-ci.org/Miljar/php-exif)`
	`1`	`+Master: [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=master)](https://travis-ci.org/Miljar/php-exif)`
	`2`	`+v0.1: [![Build Status](https://travis-ci.org/Miljar/php-exif.png?branch=v0.1)](https://travis-ci.org/Miljar/php-exif)`