upgrade deluge to 1.3.6
upgrade xbmc to 12.0
Merge branch 'deluge136' of git://github.com/iElectric/nixpkgs

Trivial upgrade, deluged still starts fine.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'xbmc-12' of git://github.com/iElectric/nixpkgs

Upgrades xbmc to version 12. It builds successfully, and Domen is the
maintainer.

Signed-off-by: Shea Levy <shea@shealevy.com>
tinyxml: fix whitespace

Signed-off-by: Shea Levy <shea@shealevy.com>