Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Mon, 11 May 2015 12:58:47 +0000 (14:58 +0200)
committermasensio <masensio@solidgear.es>
Mon, 11 May 2015 12:58:47 +0000 (14:58 +0200)
commitf448a36456da71de80abbdafdeeec7f6ac80267f
tree8f0879070da4124e5f2e2e25e684199f885d8230
parent6f3e8fbb85da750a4e01993affa68e5a3d2e1056
parentd8f64489779ad1e549bf26bf3b90ce59d1d71ce5
Merge branch 'develop' into thumbnailOOM