Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Fri, 1 Aug 2014 07:13:12 +0000 (09:13 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Fri, 1 Aug 2014 07:13:12 +0000 (09:13 +0200)
commit352ca34b4006f73ca2288c3beb6bb89205fa9747
tree868f4d2743a38bdb8699b280e071673871e0df34
parent7e423e3610b837f100d178e22d3b3f2591ba4751
parentf643660f169a26d8c2e71d7496c981bc2c171421
Merge remote-tracking branch 'upstream/8.0' into 8.0