Merge branch 'develop' into move_files_and_folders
authorjabarros <jabarros@solidgear.es>
Thu, 28 Aug 2014 10:32:39 +0000 (12:32 +0200)
committerjabarros <jabarros@solidgear.es>
Thu, 28 Aug 2014 10:32:39 +0000 (12:32 +0200)
commit28614af18dd95821206b1309c960042606f22366
treef98003bf732dfb5c877eb8e02dfb2a322792fdc9
parent118134fbd2c6eee793255ee7d9500e55431d6ffa
parent06fc13164e421293f356ab677ba2fb0b4cbd33fb
Merge branch 'develop' into move_files_and_folders
res/values/strings.xml