On Thu, Nov 28 2013, Adam Sjøgren wrote:

> Jan Tatarik <jan.tatarik@gmail.com> writes:

>> the first patch [...]

>> The second patch [...]

> Regardless of what order I apply them in, I always get a conflict in
> gnus-icalendar.el when handling the last patch.

> Could you perhaps make the patches so they don't collide?

> Maybe I'm just dense when applying them...

Sorry, haven't tried myself before submitting them.

Here you go, all in one.