Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Fri, 11 Jan 2013 07:00:20 +0000 (08:00 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 11 Jan 2013 07:00:20 +0000 (08:00 +0100)
commitf2adb5c3ec491c0916a11d6fb72f22e46e098333
tree3851a04120f3f1dca3119ff880698b7c612486a2
parent3d982b3a5eb523f49109df37ae0d402ea5bcb8bf
parent52ccea9273c9e800c060da99066507ef2a1fbe9d
Merge branch 'master-vanilla-configs' into vanilla