Commit graph

8267 commits

Author SHA1 Message Date
Francis Lachapelle 537604d65a Fixed previous propagate.
Monotone-Parent: 62ee066ad239ea56d6f2dc0b73f12d399813d68c
Monotone-Revision: cd6f87a655862b556c2f1e1031a0cdd43a995041

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T22:12:02
Monotone-Branch: ca.inverse.sogo
2012-01-12 22:12:02 +00:00
Francis Lachapelle b26858fdc2 propagate from branch 'ca.inverse.sogo.1_3_12' (head c241a8e1e716fa0db3e4f4e370c051096cc2c3e2)
to branch 'ca.inverse.sogo' (head d807738c8f35c5080fb2e1684404fb8d992c8032)

Monotone-Parent: c241a8e1e716fa0db3e4f4e370c051096cc2c3e2
Monotone-Parent: d807738c8f35c5080fb2e1684404fb8d992c8032
Monotone-Revision: 62ee066ad239ea56d6f2dc0b73f12d399813d68c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T21:01:06
Monotone-Branch: ca.inverse.sogo
2012-01-12 21:01:06 +00:00
Francis Lachapelle 84909dd628 See ChangeLog.
Monotone-Parent: 468e7e6366c0f335fea6ffbfbc6ecf9ab41aaa77
Monotone-Revision: c241a8e1e716fa0db3e4f4e370c051096cc2c3e2

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T20:52:14
2012-01-12 20:52:14 +00:00
Francis Lachapelle e5d9676c06 Don't link to gnutls.
Monotone-Parent: d669b0b3e321e22c68d092f984d543560ae1af0e
Monotone-Revision: 468e7e6366c0f335fea6ffbfbc6ecf9ab41aaa77

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T20:16:22
2012-01-12 20:16:22 +00:00
Francis Lachapelle ccf847f555 See ChangeLog
Monotone-Parent: ed15d4f340fd47347d881c8826eb40a2dc22763d
Monotone-Revision: d669b0b3e321e22c68d092f984d543560ae1af0e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T20:01:34
2012-01-12 20:01:34 +00:00
Wolfgang Sourdeau 56ad0c3289 Monotone-Parent: d0b2cce64733874b10da170e30bdcb9f9730f61e
Monotone-Revision: d807738c8f35c5080fb2e1684404fb8d992c8032

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T16:06:57
Monotone-Branch: ca.inverse.sogo
2012-01-12 16:06:57 +00:00
Wolfgang Sourdeau a1cd165aa0 merge of '59576b63b875c6db3416e7be726b196610b856a3'
and 'cde43d75f3e5fde963846340d291c77e63d995f9'

Monotone-Parent: 59576b63b875c6db3416e7be726b196610b856a3
Monotone-Parent: cde43d75f3e5fde963846340d291c77e63d995f9
Monotone-Revision: d0b2cce64733874b10da170e30bdcb9f9730f61e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T14:58:20
Monotone-Branch: ca.inverse.sogo
2012-01-12 14:58:20 +00:00
Francis Lachapelle 799be61657 propagate from branch 'ca.inverse.sogo.1_3_12' (head ed15d4f340fd47347d881c8826eb40a2dc22763d)
to branch 'ca.inverse.sogo' (head c19f9b62fb1cd88301e4921d8d23bb5b5169fb45)

Monotone-Parent: c19f9b62fb1cd88301e4921d8d23bb5b5169fb45
Monotone-Parent: ed15d4f340fd47347d881c8826eb40a2dc22763d
Monotone-Revision: cde43d75f3e5fde963846340d291c77e63d995f9

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T13:56:30
Monotone-Branch: ca.inverse.sogo
2012-01-12 13:56:30 +00:00
Francis Lachapelle 335ba606b4 Updated init script for Debian: restart will now start the daemon even if it wasn't running.
Monotone-Parent: aa2df14071d3f06710efeac3490e7780366f1b42
Monotone-Revision: ed15d4f340fd47347d881c8826eb40a2dc22763d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-12T13:55:08
2012-01-12 13:55:08 +00:00
Wolfgang Sourdeau 4c2762e7b2 Monotone-Parent: c19f9b62fb1cd88301e4921d8d23bb5b5169fb45
Monotone-Revision: 59576b63b875c6db3416e7be726b196610b856a3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T13:39:18
Monotone-Branch: ca.inverse.sogo
2012-01-12 13:39:18 +00:00
Wolfgang Sourdeau 74a4c00daa Monotone-Parent: 401881ecc26daa2ed137a36540462655a8e4504c
Monotone-Revision: c19f9b62fb1cd88301e4921d8d23bb5b5169fb45

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T03:45:04
Monotone-Branch: ca.inverse.sogo
2012-01-12 03:45:04 +00:00
Wolfgang Sourdeau 124d237f2d propagate from branch 'ca.inverse.sogo.1_3_12' (head aa2df14071d3f06710efeac3490e7780366f1b42)
to branch 'ca.inverse.sogo' (head 07cee513cf2aa27a1e3b8d634bb8482ad3645cdf)

Monotone-Parent: 07cee513cf2aa27a1e3b8d634bb8482ad3645cdf
Monotone-Parent: aa2df14071d3f06710efeac3490e7780366f1b42
Monotone-Revision: 401881ecc26daa2ed137a36540462655a8e4504c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T03:42:17
Monotone-Branch: ca.inverse.sogo
2012-01-12 03:42:17 +00:00
Wolfgang Sourdeau ca798c646e Monotone-Parent: d4b6685b33be650d23fc020ef3de5d203cb4557e
Monotone-Revision: aa2df14071d3f06710efeac3490e7780366f1b42

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-12T03:42:00
2012-01-12 03:42:00 +00:00
Wolfgang Sourdeau 677c374d56 propagate from branch 'ca.inverse.sogo.1_3_12' (head d4b6685b33be650d23fc020ef3de5d203cb4557e)
to branch 'ca.inverse.sogo' (head 38edb6b526df653889b897cf6ff9643dfd3ffad2)

Monotone-Parent: 38edb6b526df653889b897cf6ff9643dfd3ffad2
Monotone-Parent: d4b6685b33be650d23fc020ef3de5d203cb4557e
Monotone-Revision: 07cee513cf2aa27a1e3b8d634bb8482ad3645cdf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:43:18
Monotone-Branch: ca.inverse.sogo
2012-01-10 17:43:18 +00:00
Wolfgang Sourdeau d5377f90b5 merge of '134ea580b291c807ad6e5ffe49e8525c1539cbb2'
and '7d1b1b8ef84e818ba107d3af4dd79c52c376205a'

Monotone-Parent: 134ea580b291c807ad6e5ffe49e8525c1539cbb2
Monotone-Parent: 7d1b1b8ef84e818ba107d3af4dd79c52c376205a
Monotone-Revision: d4b6685b33be650d23fc020ef3de5d203cb4557e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:42:37
2012-01-10 17:42:37 +00:00
Wolfgang Sourdeau 322b21c3d7 Monotone-Parent: f5ba6db440f5a8ba817af65dea12b4a616fdfe71
Monotone-Revision: 134ea580b291c807ad6e5ffe49e8525c1539cbb2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:42:33
2012-01-10 17:42:33 +00:00
Wolfgang Sourdeau 85effb2512 Monotone-Parent: d9f13a2035f812bf584e6ed63e858a9373cd11c8
Monotone-Revision: 38edb6b526df653889b897cf6ff9643dfd3ffad2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:35:01
Monotone-Branch: ca.inverse.sogo
2012-01-10 17:35:01 +00:00
Wolfgang Sourdeau 22c803dda4 merge of '61d1836a0a9510a982d1e6754c642bc95932251c'
and 'ad2935dcd60331c29ad6e514b5a61fefaec7d69c'

Monotone-Parent: 61d1836a0a9510a982d1e6754c642bc95932251c
Monotone-Parent: ad2935dcd60331c29ad6e514b5a61fefaec7d69c
Monotone-Revision: d9f13a2035f812bf584e6ed63e858a9373cd11c8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-10T17:33:30
Monotone-Branch: ca.inverse.sogo
2012-01-10 17:33:30 +00:00
Jean Raby f554845370 propagate from branch 'ca.inverse.sogo.1_3_12' (head 7d1b1b8ef84e818ba107d3af4dd79c52c376205a)
to branch 'ca.inverse.sogo' (head 61d1836a0a9510a982d1e6754c642bc95932251c)

Monotone-Parent: 61d1836a0a9510a982d1e6754c642bc95932251c
Monotone-Parent: 7d1b1b8ef84e818ba107d3af4dd79c52c376205a
Monotone-Revision: 711719c8f61430104774de2c64f475461e66414d

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-10T17:24:00
Monotone-Branch: ca.inverse.sogo
2012-01-10 17:24:00 +00:00
Jean Raby 0e1a6f4abd that cronjob should run daily, not hourly...
Monotone-Parent: 29783e64b9a7d49e5e0be8ac1b56c15bb344190f
Monotone-Revision: 7d1b1b8ef84e818ba107d3af4dd79c52c376205a

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-10T17:23:48
2012-01-10 17:23:48 +00:00
Jean Raby 6b5806dcdd propagate from branch 'ca.inverse.sogo.1_3_12' (head 29783e64b9a7d49e5e0be8ac1b56c15bb344190f)
to branch 'ca.inverse.sogo' (head b34c698acd51d633a7d276d6fbbcab8a47e7e460)

Monotone-Parent: 29783e64b9a7d49e5e0be8ac1b56c15bb344190f
Monotone-Parent: b34c698acd51d633a7d276d6fbbcab8a47e7e460
Monotone-Revision: 61d1836a0a9510a982d1e6754c642bc95932251c

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-10T17:04:47
Monotone-Branch: ca.inverse.sogo
2012-01-10 17:04:47 +00:00
Jean Raby dbfb83d24e Add a sogo cronjob containing commented out entries.
Updated the spec and deb rules to install it by default
Updated the doc to mention this new cronjob.

Monotone-Parent: f5ba6db440f5a8ba817af65dea12b4a616fdfe71
Monotone-Revision: 29783e64b9a7d49e5e0be8ac1b56c15bb344190f

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-10T17:03:48
2012-01-10 17:03:48 +00:00
Wolfgang Sourdeau 0569c0ecbe Monotone-Parent: cec86bee0b5e2a1fc741887d9b9e535436381c6e
Monotone-Revision: ad2935dcd60331c29ad6e514b5a61fefaec7d69c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-09T22:12:16
Monotone-Branch: ca.inverse.sogo
2012-01-09 22:12:16 +00:00
Jean Raby 31962a0e28 Drop pytz as recent version doesn't work correctly with vobject.
Use dateutil.tz instead.

Monotone-Parent: cec86bee0b5e2a1fc741887d9b9e535436381c6e
Monotone-Revision: b34c698acd51d633a7d276d6fbbcab8a47e7e460

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-09T17:18:11
Monotone-Branch: ca.inverse.sogo
2012-01-09 17:18:11 +00:00
Wolfgang Sourdeau 334ff94fb9 Monotone-Parent: d5752735c793358a8300960f867a0452965215ca
Monotone-Revision: cec86bee0b5e2a1fc741887d9b9e535436381c6e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-09T16:42:20
Monotone-Branch: ca.inverse.sogo
2012-01-09 16:42:20 +00:00
Wolfgang Sourdeau 61baa6118d Monotone-Parent: 31373520d86c320c1658f22e3bde2eee178c2003
Monotone-Revision: d5752735c793358a8300960f867a0452965215ca

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-09T16:41:22
Monotone-Branch: ca.inverse.sogo
2012-01-09 16:41:22 +00:00
Wolfgang Sourdeau 5468b9b1a2 propagate from branch 'ca.inverse.sogo.1_3_12' (head f5ba6db440f5a8ba817af65dea12b4a616fdfe71)
to branch 'ca.inverse.sogo' (head df5dd81d62db331ba5c8de9f2257f9430c586534)

Monotone-Parent: df5dd81d62db331ba5c8de9f2257f9430c586534
Monotone-Parent: f5ba6db440f5a8ba817af65dea12b4a616fdfe71
Monotone-Revision: 31373520d86c320c1658f22e3bde2eee178c2003

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-09T16:38:18
Monotone-Branch: ca.inverse.sogo
2012-01-09 16:38:18 +00:00
Wolfgang Sourdeau be34aeee0e Monotone-Parent: 6e892bd0470a59c4edc792bd0d24b13e56e6a5e0
Monotone-Revision: f5ba6db440f5a8ba817af65dea12b4a616fdfe71

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-09T16:36:51
2012-01-09 16:36:51 +00:00
Wolfgang Sourdeau 13d6240038 merge of '0def0e9f316e25be6056fa81895ad9297459eaca'
and 'c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe'

Monotone-Parent: 0def0e9f316e25be6056fa81895ad9297459eaca
Monotone-Parent: c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe
Monotone-Revision: df5dd81d62db331ba5c8de9f2257f9430c586534

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-06T14:36:47
Monotone-Branch: ca.inverse.sogo
2012-01-06 14:36:47 +00:00
Wolfgang Sourdeau a55fe2793c Monotone-Parent: f70b5b1e5f982c1feda21a5227e3bc26f8dc7f66
Monotone-Revision: 0def0e9f316e25be6056fa81895ad9297459eaca

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-06T14:35:55
Monotone-Branch: ca.inverse.sogo
2012-01-06 14:35:55 +00:00
Francis Lachapelle 353757f88e remove stray backslash. Allows to build sogo-slapd-sockd again
Monotone-Parent: f70b5b1e5f982c1feda21a5227e3bc26f8dc7f66
Monotone-Revision: c82bd90e75ed49d6ff6bdcbb89b1abd0e37397fe

Monotone-Author: flachapelle@inverse.ca
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-05T19:45:25
Monotone-Date: 2012-01-05T20:01:44
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo
2012-01-05 19:45:25 +00:00
Francis Lachapelle 1bf0fb1244 See ChangeLog.
Monotone-Parent: 299e74bad69ad3fc8b6fe30fbd3be53ee3045ff7
Monotone-Revision: 6e892bd0470a59c4edc792bd0d24b13e56e6a5e0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-05T15:03:05
2012-01-05 15:03:05 +00:00
Wolfgang Sourdeau bedee82eaf merge of '61b0fdce16f6c0727e58cc97232171b41008ed41'
and 'bb276eea8dc76b5c71f49df1d23424ab19015233'

Monotone-Parent: 61b0fdce16f6c0727e58cc97232171b41008ed41
Monotone-Parent: bb276eea8dc76b5c71f49df1d23424ab19015233
Monotone-Revision: f70b5b1e5f982c1feda21a5227e3bc26f8dc7f66

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-04T15:27:58
Monotone-Branch: ca.inverse.sogo
2012-01-04 15:27:58 +00:00
Wolfgang Sourdeau 15e606341e Monotone-Parent: 16b846dd0fb3a63bdd80cb7ed360972da407527b
Monotone-Revision: bb276eea8dc76b5c71f49df1d23424ab19015233

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-04T15:26:30
Monotone-Branch: ca.inverse.sogo
2012-01-04 15:26:30 +00:00
Wolfgang Sourdeau cba23f9993 Monotone-Parent: 8fa93819d7083059128aa7103b83d47ee6a9cf2c
Monotone-Revision: 16b846dd0fb3a63bdd80cb7ed360972da407527b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-03T22:53:53
Monotone-Branch: ca.inverse.sogo
2012-01-03 22:53:53 +00:00
Wolfgang Sourdeau 1a8851fb8e Monotone-Parent: c7009a2d8a1dce845aa1a365123f4b438e3168fe
Monotone-Revision: 8fa93819d7083059128aa7103b83d47ee6a9cf2c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-03T22:53:22
Monotone-Branch: ca.inverse.sogo
2012-01-03 22:53:22 +00:00
Wolfgang Sourdeau 53feece892 Monotone-Parent: f2f2f66b3df579ca384e578aded6976b6634ffcb
Monotone-Revision: c7009a2d8a1dce845aa1a365123f4b438e3168fe

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-01-03T22:52:27
Monotone-Branch: ca.inverse.sogo
2012-01-03 22:52:27 +00:00
Francis Lachapelle 90ab1070cb See ChangeLog.
Monotone-Parent: e3a548e4955e0964c4a0211759ff98c585efda44
Monotone-Revision: 299e74bad69ad3fc8b6fe30fbd3be53ee3045ff7

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-03T21:47:18
2012-01-03 21:47:18 +00:00
Francis Lachapelle 3579c514a8 merge of '379924109229c07d133fc063329a33e5f0dc987d'
and 'b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0'

Monotone-Parent: 379924109229c07d133fc063329a33e5f0dc987d
Monotone-Parent: b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0
Monotone-Revision: e3a548e4955e0964c4a0211759ff98c585efda44

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-03T21:45:31
2012-01-03 21:45:31 +00:00
Francis Lachapelle 51cd566744 Monotone-Parent: 76bba460617a7f4d7ee1f66a47e8918059e6f046
Monotone-Revision: 379924109229c07d133fc063329a33e5f0dc987d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-03T21:42:23
2012-01-03 21:42:23 +00:00
Jean Raby 831771c572 fix changelog merge...
Monotone-Parent: 71d893c6f56295ecb4a106a46e10ccc403627cc4
Monotone-Revision: 61b0fdce16f6c0727e58cc97232171b41008ed41

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-03T21:11:31
Monotone-Branch: ca.inverse.sogo
2012-01-03 21:11:31 +00:00
Jean Raby 444a208f86 propagate from branch 'ca.inverse.sogo.1_3_12' (head b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0)
to branch 'ca.inverse.sogo' (head f2f2f66b3df579ca384e578aded6976b6634ffcb)

Monotone-Parent: b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0
Monotone-Parent: f2f2f66b3df579ca384e578aded6976b6634ffcb
Monotone-Revision: 71d893c6f56295ecb4a106a46e10ccc403627cc4

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-03T21:08:29
Monotone-Branch: ca.inverse.sogo
2012-01-03 21:08:29 +00:00
Jean Raby 67dc174db8 merge of '36b1155b71ef197756bd93ba282a5a89126511e7'
and '76bba460617a7f4d7ee1f66a47e8918059e6f046'

Monotone-Parent: 36b1155b71ef197756bd93ba282a5a89126511e7
Monotone-Parent: 76bba460617a7f4d7ee1f66a47e8918059e6f046
Monotone-Revision: b8548824eb65ecdb685bcfce0f1f1a07d6e8f2c0

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-03T20:53:39
2012-01-03 20:53:39 +00:00
Jean Raby 13cfabbfa6 Add a script to update the c_content column in existing postgresql tables
Update the table creation statements for mysql to use 'mediumtext' instead of 'text' for the c_content column.
The latter is only 64k chars long, which is not enough.

Monotone-Parent: f66b516a4e4c827bd8733fd6903ca41528172989
Monotone-Revision: 36b1155b71ef197756bd93ba282a5a89126511e7

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-01-03T20:42:34
2012-01-03 20:42:34 +00:00
Francis Lachapelle cbe9d53728 Updated installation guide.
Monotone-Parent: f66b516a4e4c827bd8733fd6903ca41528172989
Monotone-Revision: 76bba460617a7f4d7ee1f66a47e8918059e6f046

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-03T18:47:49
2012-01-03 18:47:49 +00:00
Francis Lachapelle d9bd7017d6 Updated NEWS file.
Monotone-Parent: 73233c6953684efced8bd6fdd647e6c7f35931ee
Monotone-Revision: f66b516a4e4c827bd8733fd6903ca41528172989

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-03T18:24:31
2012-01-03 18:24:31 +00:00
Francis Lachapelle 7ec702d4ce See ChangeLog.
Monotone-Parent: da4e71f9c5deca84b2df4c90effe9c90f66eb04c
Monotone-Revision: 73233c6953684efced8bd6fdd647e6c7f35931ee

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-02T19:42:46
2012-01-02 19:42:46 +00:00
Francis Lachapelle 45e13c3e4d See ChangeLog.
Monotone-Parent: 2c40f25dddacc34d66befa0a7c8e6c93868a9a92
Monotone-Revision: da4e71f9c5deca84b2df4c90effe9c90f66eb04c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-02T19:02:43
2012-01-02 19:02:43 +00:00
Wolfgang Sourdeau ad7259b751 Monotone-Parent: d8a02a76c20d760d00a46a0e98b6ca134a05cbc7
Monotone-Revision: f2f2f66b3df579ca384e578aded6976b6634ffcb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-30T20:41:30
Monotone-Branch: ca.inverse.sogo
2011-12-30 20:41:30 +00:00
Wolfgang Sourdeau 7ea37d7cf9 merge of '25877fc1df88b6744ec26e868946fc19cfd28cb8'
and '61fe02b6c3bc4f0aa3797d661d014d8c256b0de9'

Monotone-Parent: 25877fc1df88b6744ec26e868946fc19cfd28cb8
Monotone-Parent: 61fe02b6c3bc4f0aa3797d661d014d8c256b0de9
Monotone-Revision: d8a02a76c20d760d00a46a0e98b6ca134a05cbc7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-30T20:40:05
Monotone-Branch: ca.inverse.sogo
2011-12-30 20:40:05 +00:00