Merge branch 'stable'
authormasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 11:50:01 +0000 (12:50 +0100)
committermasensio <masensio@solidgear.es>
Thu, 3 Dec 2015 11:50:01 +0000 (12:50 +0100)
commitd0b5d397c44e9d3fbae2ad946137e925bbc91cb7
tree9c8368f16d291f30be57277c16f3fe574196a61c
parent210298befa8b8ac4152c816dc1f97201911328c1
parent0794871f881860364b787278a1fec85cf4ed3569
Merge branch 'stable'