| commit | 2f7f7ceccab4176217c399502b3ff95df1517627 | [log] [tgz] |
|---|---|---|
| author | Jakob Bornecrantz <jakob@vmware.com> | Tue Jan 05 20:59:24 2010 +0100 |
| committer | Jakob Bornecrantz <jakob@vmware.com> | Tue Jan 05 20:59:24 2010 +0100 |
| tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 | |
| parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 [diff] | |
| parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a [diff] |
Merge branch 'master' into libkms-master Conflicts: configure.ac