Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
This commit is contained in:
David Schulte 2015-01-23 20:16:10 +01:00
commit a8f3e27e67

View file

@ -9,4 +9,4 @@ The android package id is currently "de.arcus.playmusicexporter2". I did this to
## Copyright
Copyright (c) 2014 David Schulte. See LICENSE.txt for details.
Copyright (c) 2014 David Schulte. See LICENSE.txt for details.