Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Tue, 15 Jul 2014 14:19:24 +0000 (16:19 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Tue, 15 Jul 2014 14:19:24 +0000 (16:19 +0200)
commit52e6acf03bb80da6162b37bc0447ec695429780d
treeb0036a9371509579741a23abe890d32ea6ace093
parent0746f30e6c3159159ef1ec8ee04d43288d17e2ca
parentf98c610310de734c1c4cbecf5deabfdd70c34a1c
Merge remote-tracking branch 'upstream/8.0' into 8.0