Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 23 Jul 2014 16:02:55 +0000 (18:02 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 23 Jul 2014 16:02:55 +0000 (18:02 +0200)
commit38df44bea95906d2f94d2e949f4741e3bcfcbedb
treedf7758fd39e2020c2b0de8f996acebf3f6f8e22e
parent70242ee4f21986754ef9d19e37b721c2816edb72
parentef53a831c632d7ba31ef053aced5dbb16166e10d
Merge remote-tracking branch 'upstream/8.0' into 8.0