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)
commitc44ab769b47db4121bec51e512d8ef83665ab3db
treec369a65a02c4ae45fcb2f0c713e2c191dc0f9531
parent2ad777907e27590795b46206b2c9a1cd5fe6421a
parent5982973818f5319e215be1003c070745bbf9794f
Merge branch 'master' into release-1.4.4