taconaut/pms-mlx — pull request #63 by Raptor399 (2013-03-06 21:21:30+00:00)
Title: Merge latest version of ps3mediaserver/master

It's been a while since pms-mlx/master was merged with ps3mediaserver/master. This is my attempt at merging the two. :smiley: