On Wed, Dec 18 2013, Adam Sjøgren wrote:

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

>> On Wed, Nov 27 2013, Mario Peter wrote:

>>> it be cool to have a back link to the gnus message in the org entry
>>> beeing created from gnus article. What do you think?

>> This patch implements the requested feature.

> I get a conflict (and not just from the ChangeLog), when I try to apply
> this. Could you respin the patch?

Here you go.