Merge branch 'release-1.8'
authormasensio <masensio@solidgear.es>
Mon, 28 Sep 2015 10:33:47 +0000 (12:33 +0200)
committermasensio <masensio@solidgear.es>
Mon, 28 Sep 2015 10:33:47 +0000 (12:33 +0200)
commitee9aa68d2393521031ae73196f577dae12f40ec8
tree392d9953d16c49cc6106056d9326c4c624752be7
parent9a3872d003754cda60db515102312bf918423c65
parenta38461aaa52e4c2136695bcea47732c09291b8ef
Merge branch 'release-1.8'