2 Commits

Author	SHA1	Message	Date
Georg Ehrke	e292b1fcdb	fix merge conflicts	2012-04-15 12:43:07 +02:00
Robin Appelman	926b2b78fe	keep version numbers in their own files for faster reading	2012-04-14 16:29:11 +02:00