Merge branch 'develop' into direct_download_with_click_at_list
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 12 Jun 2013 09:47:18 +0000 (11:47 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 12 Jun 2013 09:47:18 +0000 (11:47 +0200)

Trivial merge