Merge pull request #359 from arnova/master
authorarnova <arnova77@gmail.com>
Wed, 7 Sep 2011 09:19:55 +0000 (02:19 -0700)
committerarnova <arnova77@gmail.com>
Wed, 7 Sep 2011 09:19:55 +0000 (02:19 -0700)
1  2 
xbmc/FileItem.cpp

Simple merge