[tryton-debian-vcs] tryton-modules-calendar branch upstream-2.6 created. 6381bae614c39d9f7028359bebce9fe11b430c8d

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-calendar.git;a=commitdiff;h=6381bae614c39d9f7028359bebce9fe11b430c8d
commit 6381bae614c39d9f7028359bebce9fe11b430c8d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:24 2013 +0200

    Adding upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index ce8b818..ffa7322 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-12-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 8ad4b79..39f9196 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2009-2012 Cédric Krier.
+Copyright (C) 2009-2013 Cédric Krier.
 Copyright (C) 2009-2012 Bertrand Chenal.
-Copyright (C) 2009-2012 B2CK SPRL.
+Copyright (C) 2009-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 37e5095..c3673f6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_calendar
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/calendar_.py b/calendar_.py
index 1e63623..8dc2fce 100644
--- a/calendar_.py
+++ b/calendar_.py
@@ -1604,6 +1604,7 @@ class EventRDate(ModelSQL, ModelView):
 class EventExDate(EventRDate):
     'Exception Date'
     __name__ = 'calendar.event.exdate'
+    _table = 'calendar_event_exdate'  # Needed to override EventRDate._table
 
 
 class RRule(ModelSQL, ModelView):
diff --git a/tryton.cfg b/tryton.cfg
index 76539b5..b334dad 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     ir
     res
diff --git a/trytond_calendar.egg-info/PKG-INFO b/trytond_calendar.egg-info/PKG-INFO
index 664e32b..ee96ee8 100644
--- a/trytond_calendar.egg-info/PKG-INFO
+++ b/trytond_calendar.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-calendar
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for CalDAV
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-calendar