Merge branch 'packaging' into openSUSE-13.1
authorMichal Marek <mmarek@suse.cz>
Tue, 11 Feb 2014 12:24:01 +0000 (13:24 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 11 Feb 2014 12:24:01 +0000 (13:24 +0100)
commit1efc1553751987afceff77cabd8cc1142b8196d9
tree9f388357f8692f6113880db59118833eca1b196b
parent7883186579303c07e10c963dd32101fb7aea5c2a
Merge branch 'packaging' into openSUSE-13.1

Conflicts:
doc/README.SUSE

suse-commit: dff5d3d24c1b2e621147f8521529b95466e43bad