Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 4 Aug 2014 07:39:17 +0000 (09:39 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 4 Aug 2014 07:39:17 +0000 (09:39 +0200)
commita4f0f3457ff4b54326d53598c3258ad3a4ac642b
tree868958f5b26e331839a5c72db429018c573e6643
parent352ca34b4006f73ca2288c3beb6bb89205fa9747
parentd706adba119803cb5a25df334b4c9d17921229c6
Merge remote-tracking branch 'upstream/8.0' into 8.0