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)
commit37f0586c47ab5c2b8f47a4b286b5c0df06b27c12
tree0f1cc3919d8464cc8571515e332093ba37cbac35
parent5da9c095a462e59ed3d0dd997b5adc33f2788dc8
parentd6f725bfebd0304b0b4f5d0daab8e311adf41aa7
Merge branch 'file_icons' into workaround_integration