| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Fri Dec 10 15:19:18 2010 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Fri Dec 10 15:19:18 2010 +0100 |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e [diff] | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 [diff] |
Merge branch 'master' into upstream