Commit 471fbe3bafdbfe85e470700679f5efc3a032e015

Nick Mathewson 2013-12-24T12:27:24

Merge remote-tracking branch 'rbalint/from-forked-daapd'