Merge branch 'master' into 0.2

Conflicts:
	AUTHORS
This commit is contained in:
David Barroso committed 2015-10-01 13:14:58 +02:00
commit 7a3849afd9
2 files changed
+5 -1

No files matched your search

+4
View File
@@ -1,2 +1,6 @@
David Barroso <dbarroso@spotify.com>
<<<<<<< HEAD
Elisa Jasinska <elisa@bigwaveit.org>
=======
Elisa Jasinska <elisa@bigwaveit.com>
>>>>>>> master