Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Tue, 3 Dec 2013 12:56:20 +0000 (13:56 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 3 Dec 2013 12:56:20 +0000 (13:56 +0100)
commit06f9fc4f6c583e33f92b52d142572c3e47bce562
treedb724e3d59c5e19f3eac5f82e0bb34627e1633b5
parent8241757b03829e970e7afa69cda91315b699a26c
parent84511e5bc5c31427352615a14119156ef57e8f61
Merge branch 'master-vanilla-configs' into vanilla

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