Merge branch 'scripts' into openSUSE-13.1
authorMichal Marek <mmarek@suse.cz>
Tue, 11 Feb 2014 12:28:26 +0000 (13:28 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 11 Feb 2014 12:28:26 +0000 (13:28 +0100)
commit5b3ab4c73d84fa5b0dd1336508e05a2ad2a62d5d
tree9f388357f8692f6113880db59118833eca1b196b
parent1efc1553751987afceff77cabd8cc1142b8196d9
Merge branch 'scripts' into openSUSE-13.1

Conflicts:
scripts/tar-up.sh

suse-commit: a81a5eae24180167550979347ed3dc42b7f989f7