Merge branch 'master' of github.com:xbmc/xbmc
authorMemphiz <memphis@machzwo.de>
Thu, 24 Jan 2013 19:35:59 +0000 (20:35 +0100)
committerMemphiz <memphis@machzwo.de>
Thu, 24 Jan 2013 19:35:59 +0000 (20:35 +0100)

Trivial merge