Merge branch 'release-1.7.2'
authormasensio <masensio@solidgear.es>
Mon, 6 Jul 2015 11:55:36 +0000 (13:55 +0200)
committermasensio <masensio@solidgear.es>
Mon, 6 Jul 2015 11:55:36 +0000 (13:55 +0200)
commit21ec36e39ff79217886a55045611598295c08322
treee0d66e746e1ea635e80972098b31d560a5243fef
parentb80b1c93b79fdb2de3b8c858731892fae2627df2
parenta4144dd462548eb8dc99095ac5a08f02605cdaa9
Merge branch 'release-1.7.2'