Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 07:52:10 +0000 (09:52 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Mon, 11 Aug 2014 07:52:10 +0000 (09:52 +0200)
commit39941291b55e13b5f9adeff008424102e5042ddc
tree60b31ce159da5c931ad7acb7e47cbb8871e64518
parent33e612e7502a3a859f6c751174a54dc6c61c0763
parent0aef6fac1038da5349f0bf9428575a02f6b99d14
Merge remote-tracking branch 'upstream/8.0' into 8.0