Merge remote-tracking branch 'origin/scripts'
authorJiri Slaby <jslaby@suse.cz>
Tue, 10 Jun 2014 13:31:51 +0000 (15:31 +0200)
committerJiri Slaby <jslaby@suse.cz>
Tue, 10 Jun 2014 13:31:51 +0000 (15:31 +0200)
commit21d1104436e7c748fed63eeb7a388dfdc624114a
tree9010fc4fc82fe869e1d53308b76b38f12de913b8
parent34a1820c05ae1fdf788d5ec4ebbbbb091f728b65
Merge remote-tracking branch 'origin/scripts'

suse-commit: c9b3c8c31b9a27cdc47d563a8a8cb7b2e154c9e2