Merge branch 'master' into release-1.4.4
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 1 Aug 2013 16:05:54 +0000 (18:05 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 1 Aug 2013 16:05:54 +0000 (18:05 +0200)

Trivial merge