Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 23 Jul 2014 08:12:51 +0000 (10:12 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 23 Jul 2014 08:12:51 +0000 (10:12 +0200)
commit70242ee4f21986754ef9d19e37b721c2816edb72
tree8c41da3850f4a90a4752690e9bf32f07e43f9992
parent0b6e07bd70038c53b90e6030162cc9dd759ff479
parent09b77ca11df51fbb869690393dd2fa0433f80267
Merge remote-tracking branch 'upstream/8.0' into 8.0