Public Git Hosting - ical4j.git/commit

Merge commit '6d0dd83617880092af60cc935bf4950307ea387e'

Conflicts:
CVS/Entries
source/net/fortuna/ical4j/data/CVS/Entries
source/net/fortuna/ical4j/data/UnfoldingReader.java
source/net/fortuna/ical4j/model/CVS/Entries
source/net/fortuna/ical4j/model/component/CVS/Entries
source/net/fortuna/ical4j/model/property/CVS/Entries
source/net/fortuna/ical4j/util/CVS/Entries
src/main/resources/net/fortuna/ical4j/data/CVS/Entries
src/main/resources/net/fortuna/ical4j/filter/CVS/Entries
src/main/resources/net/fortuna/ical4j/model/CVS/Entries
src/main/resources/net/fortuna/ical4j/model/component/CVS/Entries
src/main/resources/net/fortuna/ical4j/model/parameter/CVS/Entries
src/main/resources/net/fortuna/ical4j/model/property/CVS/Entries
src/main/resources/net/fortuna/ical4j/transform/CVS/Entries
src/main/resources/net/fortuna/ical4j/util/CVS/Entries
test/net/fortuna/ical4j/data/CVS/Entries
test/net/fortuna/ical4j/model/CVS/Entries
test/net/fortuna/ical4j/model/component/CVS/Entries
test/net/fortuna/ical4j/model/property/CVS/Entries

commit	1648bc48538b971f9570e0327b8e8aee769911c5
author	Arnout Engelen <arnouten@localhost.(none)>
	Sat, 6 Feb 2010 09:44:07 +0000 (6 10:44 +0100)
committer	Arnout Engelen <arnouten@localhost.(none)>
	Sat, 6 Feb 2010 09:44:07 +0000 (6 10:44 +0100)
tree	9b178a1de076cf594e4c9077ad1e3bdaafd8d6d0	tree \| snapshot (tar.gz zip)
parent	c57c23829edd54e462e7be3c8c27fa4a167cd62c	commit \| diff
parent	6d0dd83617880092af60cc935bf4950307ea387e	commit \| diff