Merge branch 'develop' into fix_crash_in_android_2
authormasensio <masensio@solidgear.es>
Fri, 13 Mar 2015 09:12:27 +0000 (10:12 +0100)
committermasensio <masensio@solidgear.es>
Fri, 13 Mar 2015 09:12:27 +0000 (10:12 +0100)
commit8fa5936eb04ebf9bb06e3dac6e21983c55a96fbc
tree9e4869412a0b1020c0ee7f03a6ffdddea736498f
parentb3147346eb3ee5befbbb1cec025eb4c0892feb7e
parent67ecc0f262d86f4fa17cee32ec4cf61e953ff2fd
Merge branch 'develop' into fix_crash_in_android_2