Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 10 Jul 2014 15:35:01 +0000 (17:35 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 10 Jul 2014 15:35:01 +0000 (17:35 +0200)
commitd21685a460822618425085d95f3ff6a96f38382a
tree379f656e70178066e711a55ef579c6214eba8bcc
parent2c840ff02a0bcc8a5c0a0ae6e9ea17147b08eba1
parent42bd6e52406673b924dd165643aeaf1e4b135ea9
Merge remote-tracking branch 'upstream/8.0' into 8.0