Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Thu, 17 Jul 2014 09:09:43 +0000 (11:09 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Thu, 17 Jul 2014 09:09:43 +0000 (11:09 +0200)
commit2e40d355e0f63b086cf1807ca0a0fc2b15dacd93
tree3249829cc1468d3d9cc15111d9798514ac8b3a77
parentd12de2cf6ff4cdd0164063a670f76cecc6f89901
parentb1f1596aef5e8968d22abb63f9e7bf8da72b009b
Merge remote-tracking branch 'upstream/8.0' into 8.0