[O] bug#13396: 24.2; org-agenda-include-diary doesn't work while using diary-file-name-prefix and diary-file-name-prefix-function elsewhere / FIX included

[Bastien]

Hi Andreas,

Thanks for the detailed report and the suggested fix.  
This is now fixed in Org's repository, it will be fixed
in Emacs when Org is merged again in emacs-24 branch.

Best regards,

-- 
 Bastien