Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 4 Sep 2013 10:00:24 +0000 (12:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 4 Sep 2013 10:00:24 +0000 (12:00 +0200)
commit0039a5ebe6e2a4cc6467731918403dda7234dd57
treef4882f67fe93169803e3eb53d4d9dc9c67bf4ddc
parentfa4144a4b52d4acf13dd1ef8ce0fd48f04bc5569
parentc2b86e86837bad0d01e86d2013ae1df0226ddbf0
Merge branch 'master-vanilla-configs' into vanilla