Merge remote-tracking branch 'origin/master' into long_press
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 31 Oct 2012 16:52:28 +0000 (17:52 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 31 Oct 2012 16:52:28 +0000 (17:52 +0100)
commit463194d0b45b5f87bf23eef2a60e2dd6fb904819
treed7378b34927b3f6aa6bfab9dad28f6c0323de89a
parent454f15138edf56b470b0cfe6fad7c09e46b9159b
parentcce7e1247a5b91d6829b5bcc2f40bd1a47b45512
Merge remote-tracking branch 'origin/master' into long_press