Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Mon, 8 Jul 2013 07:30:06 +0000 (09:30 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 8 Jul 2013 07:30:06 +0000 (09:30 +0200)
commit28c9b0a1efc68826ed9a7c04879e2a9ca8d782f0
tree56bd646a4669994c937ae0ec4f20a63c3d8cbb31
parent58436255f25f217081852d7c827d520f533a0f0a
parent953bfa0ea67eeb17f4f7a323232cce59e314e760
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
series.conf