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)
commita81a5eae24180167550979347ed3dc42b7f989f7
tree671bd6cc91f2cd3b416216f067eda5dbe8543f11
parentdff5d3d24c1b2e621147f8521529b95466e43bad
parent85817dc44685ae2437527072a261565313852b2b
Merge branch 'scripts' into openSUSE-13.1

Conflicts:
scripts/tar-up.sh