Merge branch 'remotes/jsbackus/mpd_lua52'
commit2ebaf50863bb4ab3c479863af6672d7876d3b2ee
authorArnout Engelen <arnouten@bzzt.net>
Wed, 14 May 2014 21:50:58 +0000 (14 23:50 +0200)
committerArnout Engelen <arnouten@bzzt.net>
Wed, 14 May 2014 21:50:58 +0000 (14 23:50 +0200)
tree1088c9c128935d593b7130b7f045c613c2d55a3f
parente33387cc78508935c7ae6a5a1384be9fea584e17
parent29ceb55369a9338c213121fc6b85fd72fd0d9027
Merge branch 'remotes/jsbackus/mpd_lua52'