Merge branch 'develop' into ADFS_auth_support
authorjabarros <jabarros@solidgear.es>
Tue, 9 Sep 2014 11:17:41 +0000 (13:17 +0200)
committerjabarros <jabarros@solidgear.es>
Tue, 9 Sep 2014 11:17:41 +0000 (13:17 +0200)
commitba6c6375cfc0feb7104d79ab98e2dcd198eb7dc1
treebebc4ef8b377a4e9d0453ad7800c01a79756bff4
parentd3a99fff003c9b41c6252f0ed8b8135738e2c383
parent84d640e0c965e4b1d592458791881b3d64bbd72a
Merge branch 'develop' into ADFS_auth_support

Conflicts:
res/values/strings.xml
res/values/strings.xml