Merge remote-tracking branch 'origin/scripts'
authorJean Delvare <jdelvare@suse.de>
Sun, 8 Dec 2013 13:32:52 +0000 (14:32 +0100)
committerJean Delvare <jdelvare@suse.de>
Sun, 8 Dec 2013 13:32:52 +0000 (14:32 +0100)
commite7f890a5878bb9947f0f19c6af95375e061418a7
treef618dc725638e4dc11bb1b88599fc4dd504dd561
parentb3c966ecaf07ed646ccefe2ecf7a2d9a45274f64
parent8b2d7c4d9f80ed9f1d80128356c800d685a98606
Merge remote-tracking branch 'origin/scripts'