Merge branch 'release-1.4.1' oc-android-1.4.1
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:10:10 +0000 (18:10 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 26 Jun 2013 16:10:10 +0000 (18:10 +0200)
commit5781090e2be3fddcb47d2d7e504e859321eb2ede
tree269311647b615195483b5d5c11504357f5299a59
parent3c00f0804178730a10a76030ad46fbbf988ab6b6
parent04803ae879ce8762c2b59656a0b5c1614c18712f
Merge branch 'release-1.4.1'