Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 10 Jul 2014 15:53:29 +0000 (17:53 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 10 Jul 2014 15:53:29 +0000 (17:53 +0200)
commiteaea4b124178fc5f316b92760b066efa21673057
tree4f30f515d5ed0facfb1f918cb8e870577b78e819
parentd21685a460822618425085d95f3ff6a96f38382a
parent19c738095154a853f6aab33ddc57b2b4d3c20c13
Merge remote-tracking branch 'upstream/8.0' into 8.0