Merge remote-tracking branch 'upstream/8.0' into 8.0
authorAlicia FLOREZ <alic.florez@gmail.com>
Wed, 23 Jul 2014 07:27:17 +0000 (09:27 +0200)
committerAlicia FLOREZ <alic.florez@gmail.com>
Wed, 23 Jul 2014 07:27:17 +0000 (09:27 +0200)
commit0b6e07bd70038c53b90e6030162cc9dd759ff479
treea79ff5205c1018323a0d6270d33fa26f3afab02a
parenteed164d79d5aa0ff82fa88712b35e7661a044d0b
parent299246e2aec867cc90f56caaefad6c99d8f2f31f
Merge remote-tracking branch 'upstream/8.0' into 8.0