Merge branch 'develop' into operations_service
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 3 Apr 2014 09:27:44 +0000 (11:27 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 3 Apr 2014 09:27:44 +0000 (11:27 +0200)
commit5611205f1d5bc06bc89a73ac27f70098a09bd9ae
tree19eda6f888b66174ff2038e915de0aaaeb6dc3db
parent0024569aff6073c55663213e0f20f7493fd16058
parent901b6ac61e4a84d281e86b4989aa099801b28de7
Merge branch 'develop' into operations_service
res/values/strings.xml