Merge branch 'file_icons' into workaround_integration
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 30 Jan 2013 12:49:36 +0000 (13:49 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 30 Jan 2013 12:49:36 +0000 (13:49 +0100)

Trivial merge