Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 12 May 2015 11:32:56 +0000 (13:32 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 12 May 2015 11:32:56 +0000 (13:32 +0200)
commit25f5eb193e1f6bc7cceaf95676dbc59a9c6d7ffb
treedc2796ce069ca08a4bbaf6afdb6d7ac2b5bf73e3
parent10e4373bcfc7acdda25e91ea35e9ea8a8fb89c84
parente24b31f42d9b175e352f5965f3e4eeb07bbf39f5
Merge remote-tracking branch 'origin/thumbnailOOM' into thumbnailOOM