Merge branch 'develop' into thumbnailOOM
authormasensio <masensio@solidgear.es>
Tue, 5 May 2015 11:53:56 +0000 (13:53 +0200)
committermasensio <masensio@solidgear.es>
Tue, 5 May 2015 11:53:56 +0000 (13:53 +0200)
commitddbb5d25223c28a2cdd68dee6799a7d9937887bb
tree72aa8c9b6a18860e48ed89c3ca338408a8177fb9
parent7eea2ea507b41edb242cc1a2fe9eae1a9c03d280
parent8882fb2dbdd9cfaa5f8e35d460897c763e990f70
Merge branch 'develop' into thumbnailOOM