Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 13 Feb 2013 07:00:23 +0000 (08:00 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 13 Feb 2013 07:00:23 +0000 (08:00 +0100)
commit303c3700ce9b5b0d98312812eb2aca537edb613c
tree4d9b9066ff2d3b1faf19ce4f7de1c86ff2118ba1
parentdebb1c554be43dcdf2ac6ce6c879f00e9e3f3603
parent844f33de6b85517305dfd6b4bf90a37d7187f016
Merge branch 'master-vanilla-configs' into vanilla