Julio García 321e16c382 Merge tag 'SOGo-2.2.17a' into jjgarcia/merge-from-upstream ... SOGo 2.2.17a Conflicts: NEWS		2015-04-10 13:12:46 +02:00
..
GDLContentStore	Applied patch for #3092	2015-02-05 09:29:29 -05:00
NGCards	Merge branch 'master-upstream' into jjgarcia/merge-from-upstream	2015-02-02 12:53:49 +01:00