Merge branch 'nedsettings'
authorJonathan Marshall <jmarshall@xbmc.org>
Sun, 5 Jan 2014 03:18:27 +0000 (16:18 +1300)
committerJonathan Marshall <jmarshall@xbmc.org>
Sun, 5 Jan 2014 03:18:27 +0000 (16:18 +1300)
commit543bc2d2fa8ec5e6e057ee4d6d70f2e595806bca
treea4f5b7bb45a0d584cdddc81e329080b2a81a1934
parent77e4b434c90279c3bcb24c4c37bd218480d16caf
parent03178f39d174ed842dc25ca024d41e6189bfa483
Merge branch 'nedsettings'