Merge pull request #87 from BenjaminHae/master

author Andy <andy@ndyk.de>

Sun, 20 Sep 2015 13:54:20 +0000 (15:54 +0200)

committer Andy <andy@ndyk.de>

Sun, 20 Sep 2015 13:54:20 +0000 (15:54 +0200)
author Andy <andy@ndyk.de>
Sun, 20 Sep 2015 13:54:20 +0000 (15:54 +0200)
committer Andy <andy@ndyk.de>
Sun, 20 Sep 2015 13:54:20 +0000 (15:54 +0200)
diff --cc htdocs/index.html
Simple merge
diff --cc htdocs/js/mpd.js
Simple merge
author	Andy <andy@ndyk.de>
	Sun, 20 Sep 2015 13:54:20 +0000 (15:54 +0200)
committer	Andy <andy@ndyk.de>
	Sun, 20 Sep 2015 13:54:20 +0000 (15:54 +0200)
		1	2
htdocs/index.html	patch \|	diff1 \|	diff2 \|	blob \| history
htdocs/js/mpd.js	patch \|	diff1 \|	diff2 \|	blob \| history