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)
commit45c1267b7828d47be8c4282eee1a4c5d2be4cf39
tree5fa06f28f94abc86007d86f6ef69292f233b9a32
parent04bf8922af3a708b6e0d0ad7e09a4c4e3bf3ff70
Merge remote-tracking branch 'origin/scripts'

suse-commit: e7f890a5878bb9947f0f19c6af95375e061418a7