Merge branch 'develop' into SettingsGreyedOut
authorjabarros <jabarros@solidgear.es>
Tue, 20 Jan 2015 08:25:20 +0000 (09:25 +0100)
committerjabarros <jabarros@solidgear.es>
Tue, 20 Jan 2015 08:25:20 +0000 (09:25 +0100)
commitd0cee8be8556d1db46ec6193b209f9ffdae104d0
tree827a8546ca4b0fc71a9660512ab669944e8d51da
parent0e061f6f06173c09f19254dbfb90cabd261d64a1
parent99276bae85de946bea62116a0455275804e02fe8
Merge branch 'develop' into SettingsGreyedOut