Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Fri, 29 Nov 2013 11:30:36 +0000 (12:30 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 29 Nov 2013 11:30:36 +0000 (12:30 +0100)
commit8b804aee6931669af7dc673fb9c83dfbd96146c4
tree6f5bb6339c8a6b3ce3995dc1da8762c3a356f142
parent82bd906d7ae69f3eb0d382d5f5b2d380650b8ec4
parent06e7f535d436249cfdae2843c6b05d1ae58e9e6f
Merge branch 'master-vanilla-configs' into vanilla
config/i386/vanilla
config/x86_64/vanilla