Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Thu, 28 Nov 2013 15:34:28 +0000 (16:34 +0100)
committerMichal Marek <mmarek@suse.cz>
Thu, 28 Nov 2013 15:34:28 +0000 (16:34 +0100)
commit8400ee2d871e7a55e936bf24b6f2256fd6819659
treebabb7f03f98bdca01631ef5082c900630371890d
parentdf05c9bcb053ac1c9f15fe78d0f0777efb9025cb
parent8e11a7fa63e57c9948adcec417d07378fd5e77cb
Merge branch 'master-vanilla-configs' into vanilla

Conflicts:
config/x86_64/vanilla
config/x86_64/vanilla