Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Tue, 5 May 2015 08:31:46 +0000 (10:31 +0200)
committermasensio <masensio@solidgear.es>
Tue, 5 May 2015 08:31:46 +0000 (10:31 +0200)
commit7eea2ea507b41edb242cc1a2fe9eae1a9c03d280
tree4e7f1ba21a08a4b941073c858f0d6aab99c9b374
parent6b0af8296009bc8b89bc98a8ec8b3afd7815ed8e
parent3b08f9f5af5c4eb17c838cdfd5ef74be908a395a
Merge branch 'develop' into thumbnailOOM