Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 22 Jul 2014 07:57:16 +0000 (09:57 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 22 Jul 2014 07:57:16 +0000 (09:57 +0200)
commiteed164d79d5aa0ff82fa88712b35e7661a044d0b
treef93e7511758ae74ff2c697943f49936c6b2abbec
parentb16fdbf0744139cc1c60d128496b2a5edd5ca87b
parent954ab3eefb675297fc1c6eb202cd6a17cb403a95
Merge remote-tracking branch 'upstream/8.0' into 8.0