Wolfgang Sourdeau
7bb437021a
Monotone-Parent: d6049f3e55fa0ac4385db63c3777aa1d84d5511c
...
Monotone-Revision: 3fdbf80f4c1de08138ff9435f54fd9f663ef5b8f
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-20T14:13:56
Monotone-Branch: ca.inverse.sogo
2012-07-20 14:13:56 +00:00
Wolfgang Sourdeau
e55e89c496
Monotone-Parent: 3bf968de90811032a5b011cf48b3e8c402aa2425
...
Monotone-Revision: d6049f3e55fa0ac4385db63c3777aa1d84d5511c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-20T14:13:50
Monotone-Branch: ca.inverse.sogo
2012-07-20 14:13:50 +00:00
Wolfgang Sourdeau
2d132678cf
Monotone-Parent: 0bab258b30947c4b34f1e39acd0a61b7954c9958
...
Monotone-Revision: 3bf968de90811032a5b011cf48b3e8c402aa2425
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-20T14:08:03
Monotone-Branch: ca.inverse.sogo
2012-07-20 14:08:03 +00:00
Wolfgang Sourdeau
7ec5e22f9d
Monotone-Parent: 44c81c0fbde1cf04e0ee2064fd07a4e6b1e74fcb
...
Monotone-Revision: 0bab258b30947c4b34f1e39acd0a61b7954c9958
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-20T06:53:01
Monotone-Branch: ca.inverse.sogo
2012-07-20 06:53:01 +00:00
Wolfgang Sourdeau
7fa7630d74
Monotone-Parent: fc87b2e35370aef34db8f91a54bc71a27c2ea297
...
Monotone-Revision: 44c81c0fbde1cf04e0ee2064fd07a4e6b1e74fcb
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T20:31:15
Monotone-Branch: ca.inverse.sogo
2012-07-19 20:31:15 +00:00
Wolfgang Sourdeau
0b2f4e5c44
Monotone-Parent: b65572c3789024ccb44bac952fa19cc6708071a0
...
Monotone-Revision: fc87b2e35370aef34db8f91a54bc71a27c2ea297
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T20:26:33
Monotone-Branch: ca.inverse.sogo
2012-07-19 20:26:33 +00:00
Wolfgang Sourdeau
b4f8a596f5
Monotone-Parent: be9c203f3a5b8055a08854fac75321227532ee8c
...
Monotone-Revision: b65572c3789024ccb44bac952fa19cc6708071a0
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T19:28:44
Monotone-Branch: ca.inverse.sogo
2012-07-19 19:28:44 +00:00
Wolfgang Sourdeau
cd18ceeb6c
Monotone-Parent: f43939c9f93e2ae0c474453779ec04d06a04dd8a
...
Monotone-Revision: be9c203f3a5b8055a08854fac75321227532ee8c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T19:09:41
Monotone-Branch: ca.inverse.sogo
2012-07-19 19:09:41 +00:00
Wolfgang Sourdeau
4c86e1b09b
Monotone-Parent: 7a12a4fc3471976029528f54b57e6999eff2b3aa
...
Monotone-Revision: f43939c9f93e2ae0c474453779ec04d06a04dd8a
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T19:06:46
Monotone-Branch: ca.inverse.sogo
2012-07-19 19:06:46 +00:00
Wolfgang Sourdeau
2de531a6cb
Monotone-Parent: 8b81870c2b6bc608846d32e8e0b91c60d47ebb6a
...
Monotone-Revision: 7a12a4fc3471976029528f54b57e6999eff2b3aa
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T01:30:43
Monotone-Branch: ca.inverse.sogo
2012-07-19 01:30:43 +00:00
Wolfgang Sourdeau
3ddba08a9e
Monotone-Parent: 2cad87365f0a0c5651f8609b76b87ed5eeb351c4
...
Monotone-Revision: 8b81870c2b6bc608846d32e8e0b91c60d47ebb6a
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T01:26:45
Monotone-Branch: ca.inverse.sogo
2012-07-19 01:26:45 +00:00
Wolfgang Sourdeau
124f3f995e
Monotone-Parent: cd2989d3a11079dde73d3a4890b0976e1405ebaa
...
Monotone-Revision: 2cad87365f0a0c5651f8609b76b87ed5eeb351c4
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-19T01:25:04
Monotone-Branch: ca.inverse.sogo
2012-07-19 01:25:04 +00:00
Jean Raby
d067ddce43
propagate from branch 'ca.inverse.sogo.1_3_17' (head 8ce46d6fa7b1d1a9d12069cee3ba796d99d668d2)
...
to branch 'ca.inverse.sogo' (head 207a29e043f7f41c818a8697fe995a55940787fc)
Monotone-Parent: 207a29e043f7f41c818a8697fe995a55940787fc
Monotone-Parent: 8ce46d6fa7b1d1a9d12069cee3ba796d99d668d2
Monotone-Revision: cd2989d3a11079dde73d3a4890b0976e1405ebaa
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-18T20:22:58
Monotone-Branch: ca.inverse.sogo
2012-07-18 20:22:58 +00:00
Jean Raby
aeef968c4e
* Tests/Integration/config.py.in: New config parameter: webCalendarURL
...
* Tests/Integration/webdavlib.py(HTTPPOST,HTTPGET):
Allow cookies in post and get requests.
* Tests/Integration/test-ui-posts.py: New test class
Currently contains only one test case which exercises addWebCalendar
* SoObjects/Appointments/GNUmakefile:
use -Wl,--no-as-needed when linking. Fixes #1863
Monotone-Parent: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a
Monotone-Revision: 8ce46d6fa7b1d1a9d12069cee3ba796d99d668d2
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-18T20:22:54
2012-07-18 20:22:54 +00:00
Ludovic Marcotte
c0587a37c2
propagate from branch 'ca.inverse.sogo.1_3_17' (head 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a)
...
to branch 'ca.inverse.sogo' (head 3e3aa908260b5a804d05c2857b5c7ae70d861828)
Monotone-Parent: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a
Monotone-Parent: 3e3aa908260b5a804d05c2857b5c7ae70d861828
Monotone-Revision: 207a29e043f7f41c818a8697fe995a55940787fc
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-18T19:06:06
Monotone-Branch: ca.inverse.sogo
2012-07-18 19:06:06 +00:00
Ludovic Marcotte
1abc40c127
See ChangeLog
...
Monotone-Parent: f489c387ef5efde7f9beee4a9b97ecf85275ffb2
Monotone-Revision: 080d411d52272c158ce60ea0bab6ba8eb9d9aa2a
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-18T19:05:58
2012-07-18 19:05:58 +00:00
Jean Raby
a30e885925
propagate from branch 'ca.inverse.sogo.1_3_17' (head f489c387ef5efde7f9beee4a9b97ecf85275ffb2)
...
to branch 'ca.inverse.sogo' (head 40163312c9ee80acc859ad4dab810588c8c49167)
Monotone-Parent: 40163312c9ee80acc859ad4dab810588c8c49167
Monotone-Parent: f489c387ef5efde7f9beee4a9b97ecf85275ffb2
Monotone-Revision: 3e3aa908260b5a804d05c2857b5c7ae70d861828
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-18T15:30:50
Monotone-Branch: ca.inverse.sogo
2012-07-18 15:30:50 +00:00
Jean Raby
c88d86ec95
* Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh
...
* Scripts/sql-update-1.3.16_to_1.3.17.sh:
New scripts to expand c_cycleinfo to mediumtext or varchar(1000000)
The field was expanded around 1.3.3.
See http://www.sogo.nu/bugs/view.php?id=1848
Monotone-Parent: 1bcd208d669189aec549aa4351b9d92a29c6d9b9
Monotone-Revision: f489c387ef5efde7f9beee4a9b97ecf85275ffb2
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-18T15:30:38
2012-07-18 15:30:38 +00:00
Jean Raby
c73780b930
propagate from branch 'ca.inverse.sogo.1_3_17' (head 1bcd208d669189aec549aa4351b9d92a29c6d9b9)
...
to branch 'ca.inverse.sogo' (head 6184bf3d89ac83d570e7ff1690d7366cef05543c)
Monotone-Parent: 1bcd208d669189aec549aa4351b9d92a29c6d9b9
Monotone-Parent: 6184bf3d89ac83d570e7ff1690d7366cef05543c
Monotone-Revision: 40163312c9ee80acc859ad4dab810588c8c49167
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-17T16:56:30
Monotone-Branch: ca.inverse.sogo
2012-07-17 16:56:30 +00:00
Jean Raby
6f0f95d253
Use xml.etree.ElementTree.iselement() instead of some homegrown stuff
...
that used a private class from xml.etree.ElementTree.
Works with cElementTree
Monotone-Parent: ed7f1623b0cb7e935297f6652b76074c1ff952df
Monotone-Revision: 1bcd208d669189aec549aa4351b9d92a29c6d9b9
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-17T16:56:19
2012-07-17 16:56:19 +00:00
Wolfgang Sourdeau
5a63e89790
propagate from branch 'ca.inverse.sogo.1_3_17' (head ed7f1623b0cb7e935297f6652b76074c1ff952df)
...
to branch 'ca.inverse.sogo' (head 635b5bfac47476bfa8994f9151936f2d4bd7d4f3)
Monotone-Parent: 635b5bfac47476bfa8994f9151936f2d4bd7d4f3
Monotone-Parent: ed7f1623b0cb7e935297f6652b76074c1ff952df
Monotone-Revision: 6184bf3d89ac83d570e7ff1690d7366cef05543c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-16T13:37:50
Monotone-Branch: ca.inverse.sogo
2012-07-16 13:37:50 +00:00
Wolfgang Sourdeau
093c984b42
Monotone-Parent: 22bcd9c626e305661b31c70a49c93352266c2dc8
...
Monotone-Revision: ed7f1623b0cb7e935297f6652b76074c1ff952df
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-16T13:35:02
2012-07-16 13:35:02 +00:00
Wolfgang Sourdeau
c90f4804e2
propagate from branch 'ca.inverse.sogo.1_3_17' (head 22bcd9c626e305661b31c70a49c93352266c2dc8)
...
to branch 'ca.inverse.sogo' (head b9f26c4bac060372453dcba2c0f2b9a17ffc93bb)
Monotone-Parent: 22bcd9c626e305661b31c70a49c93352266c2dc8
Monotone-Parent: b9f26c4bac060372453dcba2c0f2b9a17ffc93bb
Monotone-Revision: 635b5bfac47476bfa8994f9151936f2d4bd7d4f3
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-14T02:41:33
Monotone-Branch: ca.inverse.sogo
2012-07-14 02:41:33 +00:00
Wolfgang Sourdeau
91d9836d80
Monotone-Parent: 471d12add6428916fe0b3d9938d1362d062f1de1
...
Monotone-Revision: 22bcd9c626e305661b31c70a49c93352266c2dc8
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-14T02:41:29
2012-07-14 02:41:29 +00:00
Wolfgang Sourdeau
5d91d22c58
propagate from branch 'ca.inverse.sogo.1_3_17' (head 471d12add6428916fe0b3d9938d1362d062f1de1)
...
to branch 'ca.inverse.sogo' (head c4c3d792d4b668f2d69a06c140f8d2223d8dbc7c)
Monotone-Parent: 471d12add6428916fe0b3d9938d1362d062f1de1
Monotone-Parent: c4c3d792d4b668f2d69a06c140f8d2223d8dbc7c
Monotone-Revision: b9f26c4bac060372453dcba2c0f2b9a17ffc93bb
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T21:03:55
Monotone-Branch: ca.inverse.sogo
2012-07-13 21:03:55 +00:00
Wolfgang Sourdeau
6b89fbb769
Monotone-Parent: f071f53cbc4a39b0b852c58e7e57332f05ef1e0c
...
Monotone-Revision: 471d12add6428916fe0b3d9938d1362d062f1de1
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T21:03:50
2012-07-13 21:03:50 +00:00
Wolfgang Sourdeau
0e276d2acc
propagate from branch 'ca.inverse.sogo.1_3_17' (head f071f53cbc4a39b0b852c58e7e57332f05ef1e0c)
...
to branch 'ca.inverse.sogo' (head 4117fa474ee2ae428f109a99cb50a33479342fa8)
Monotone-Parent: 4117fa474ee2ae428f109a99cb50a33479342fa8
Monotone-Parent: f071f53cbc4a39b0b852c58e7e57332f05ef1e0c
Monotone-Revision: c4c3d792d4b668f2d69a06c140f8d2223d8dbc7c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T21:00:00
Monotone-Branch: ca.inverse.sogo
2012-07-13 21:00:00 +00:00
Wolfgang Sourdeau
6cd17dc9b8
Monotone-Parent: 493dd9034b71a42f4fc3df70a482872a7c50cc22
...
Monotone-Revision: f071f53cbc4a39b0b852c58e7e57332f05ef1e0c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:59:09
2012-07-13 20:59:09 +00:00
Wolfgang Sourdeau
ee723f9694
fixed neglected warnings
...
Monotone-Parent: 61a57c3431ce88c941b644d5a0ce21abb1f82f8c
Monotone-Revision: 493dd9034b71a42f4fc3df70a482872a7c50cc22
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:37:16
2012-07-13 20:37:16 +00:00
Wolfgang Sourdeau
cbd4bd907a
Monotone-Parent: 7fb9c9db1f708e5ebd59004e2cd37cf85e5d94d6
...
Monotone-Revision: 61a57c3431ce88c941b644d5a0ce21abb1f82f8c
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:36:19
2012-07-13 20:36:19 +00:00
Wolfgang Sourdeau
d40be7d196
fixed missing declaration update
...
Monotone-Parent: 11acebc5a76969e7e9f712ff0325cb10e3171669
Monotone-Revision: 7fb9c9db1f708e5ebd59004e2cd37cf85e5d94d6
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:35:02
2012-07-13 20:35:02 +00:00
Wolfgang Sourdeau
5b1abf0d68
fixed missing declaration update
...
Monotone-Parent: d953e1b8cae8bcdf2a3cff4219ea365af8391941
Monotone-Revision: 11acebc5a76969e7e9f712ff0325cb10e3171669
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:34:13
2012-07-13 20:34:13 +00:00
Wolfgang Sourdeau
82f3f1b3d9
Monotone-Parent: 9475f39d99549bfa74e7f88be7e54d9650beb0d5
...
Monotone-Revision: d953e1b8cae8bcdf2a3cff4219ea365af8391941
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:31:41
2012-07-13 20:31:41 +00:00
Wolfgang Sourdeau
caf58a7c4a
Monotone-Parent: c812fb58ff32ddf15bcafe1527b4871905de1415
...
Monotone-Revision: 9475f39d99549bfa74e7f88be7e54d9650beb0d5
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-13T20:25:47
2012-07-13 20:25:47 +00:00
Francis Lachapelle
6a5ab405a2
Updated NEWS file.
...
Monotone-Parent: be001fad1d7b392001a6534b6758e7d78713c9a2
Monotone-Revision: c812fb58ff32ddf15bcafe1527b4871905de1415
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-13T14:38:06
2012-07-13 14:38:06 +00:00
Francis Lachapelle
ae84644bdc
Monotone-Parent: f9bb5a5f3c1e5dea5cb04ead39373ab637b9ee09
...
Monotone-Revision: be001fad1d7b392001a6534b6758e7d78713c9a2
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-13T14:37:50
2012-07-13 14:37:50 +00:00
Francis Lachapelle
a6b8e42cbf
Monotone-Parent: 29aefdeb26834742b8cd9f01120573b4dcbcc7ed
...
Monotone-Revision: f9bb5a5f3c1e5dea5cb04ead39373ab637b9ee09
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-13T13:00:02
2012-07-13 13:00:02 +00:00
Jean Raby
6a4657d23d
propagate from branch 'ca.inverse.sogo.1_3_17' (head 29aefdeb26834742b8cd9f01120573b4dcbcc7ed)
...
to branch 'ca.inverse.sogo' (head 3dfe653dfcaeadc5fe93ff1f2c0a1f9d049c1836)
Monotone-Parent: 29aefdeb26834742b8cd9f01120573b4dcbcc7ed
Monotone-Parent: 3dfe653dfcaeadc5fe93ff1f2c0a1f9d049c1836
Monotone-Revision: 4117fa474ee2ae428f109a99cb50a33479342fa8
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-12T16:47:28
Monotone-Branch: ca.inverse.sogo
2012-07-12 16:47:28 +00:00
Jean Raby
ef848303a3
* SoObjects/Mailer/SOGoMailForward.m (from, to, cc, reply-to):
...
mailHeaders returns an array if there are multiple headers of the same type.
Handle this case to correctly show multiple from, to, cc and reply-to headers
in mail replies/forwards instead of crashing.
Monotone-Parent: dac25405c6ab2f1d735ddb9f6db4243e5e96d14b
Monotone-Revision: 29aefdeb26834742b8cd9f01120573b4dcbcc7ed
Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-07-12T16:47:23
2012-07-12 16:47:23 +00:00
Wolfgang Sourdeau
c342d3defe
Monotone-Parent: f48e9e2abfb00e03cccd2aa8fd8998a415bb5ce1
...
Monotone-Revision: 3dfe653dfcaeadc5fe93ff1f2c0a1f9d049c1836
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-12T15:05:33
Monotone-Branch: ca.inverse.sogo
2012-07-12 15:05:33 +00:00
Wolfgang Sourdeau
6c5bbadfd0
propagate from branch 'ca.inverse.sogo.1_3_17' (head dac25405c6ab2f1d735ddb9f6db4243e5e96d14b)
...
to branch 'ca.inverse.sogo' (head 919ac12670dffae621309b1826bc13e0a9ecbe21)
Monotone-Parent: 919ac12670dffae621309b1826bc13e0a9ecbe21
Monotone-Parent: dac25405c6ab2f1d735ddb9f6db4243e5e96d14b
Monotone-Revision: f48e9e2abfb00e03cccd2aa8fd8998a415bb5ce1
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-12T15:04:58
Monotone-Branch: ca.inverse.sogo
2012-07-12 15:04:58 +00:00
Wolfgang Sourdeau
825686eaed
merge of '1fae890d6e269d7918982811c46400a4ff38745d'
...
and '4d39a71900cc87ae1185f268c1c35a5a4b086b1d'
Monotone-Parent: 1fae890d6e269d7918982811c46400a4ff38745d
Monotone-Parent: 4d39a71900cc87ae1185f268c1c35a5a4b086b1d
Monotone-Revision: dac25405c6ab2f1d735ddb9f6db4243e5e96d14b
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-12T15:04:27
2012-07-12 15:04:27 +00:00
Wolfgang Sourdeau
87a7732361
applied changes from c6b25920d896b2d19d0ef40a4cadee46c87bba2d
...
through fcec9822c0aaee8cefba77d0f50a8582b33fa3f0
Monotone-Parent: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Revision: 4d39a71900cc87ae1185f268c1c35a5a4b086b1d
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-12T15:03:38
2012-07-12 15:03:38 +00:00
Francis Lachapelle
d965eec051
Minor improvements to the preferences window.
...
Monotone-Parent: b456b18f292850c6fefa107c0ca59bded3a6e6a3
Monotone-Revision: 1fae890d6e269d7918982811c46400a4ff38745d
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-11T19:53:45
2012-07-11 19:53:45 +00:00
Francis Lachapelle
c522130c25
Added missing strings for calendar notifications.
...
Monotone-Parent: 740654a1f1be6a68843349cf438d5a87445f489e
Monotone-Revision: b456b18f292850c6fefa107c0ca59bded3a6e6a3
Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-07-11T19:50:56
2012-07-11 19:50:56 +00:00
Ludovic Marcotte
8a9bdcd31b
propagate from branch 'ca.inverse.sogo.1_3_17' (head 740654a1f1be6a68843349cf438d5a87445f489e)
...
to branch 'ca.inverse.sogo' (head 2252f3047b058ea629e568aec7efb2b0432e3c0c)
Monotone-Parent: 2252f3047b058ea629e568aec7efb2b0432e3c0c
Monotone-Parent: 740654a1f1be6a68843349cf438d5a87445f489e
Monotone-Revision: 919ac12670dffae621309b1826bc13e0a9ecbe21
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T18:58:31
Monotone-Branch: ca.inverse.sogo
2012-07-11 18:58:31 +00:00
Ludovic Marcotte
2c987bae06
See ChangeLog
...
Monotone-Parent: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Revision: 740654a1f1be6a68843349cf438d5a87445f489e
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T18:57:27
2012-07-11 18:57:27 +00:00
Ludovic Marcotte
6556c92c87
See ChangeLog
...
Monotone-Parent: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Revision: 975e40192e290b5aa4bc5c5b99a12b299d84fa5a
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T17:27:54
2012-07-11 17:27:54 +00:00
Ludovic Marcotte
d932f1fd47
Fixed merge
...
Monotone-Parent: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877
Monotone-Revision: 2252f3047b058ea629e568aec7efb2b0432e3c0c
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:09:37
Monotone-Branch: ca.inverse.sogo
2012-07-11 14:09:37 +00:00
Ludovic Marcotte
569949bae7
propagate from branch 'ca.inverse.sogo.1_3_17' (head 0012ddb107483154b76c08f33a7b8437b5309529)
...
to branch 'ca.inverse.sogo' (head fcec9822c0aaee8cefba77d0f50a8582b33fa3f0)
Monotone-Parent: 0012ddb107483154b76c08f33a7b8437b5309529
Monotone-Parent: fcec9822c0aaee8cefba77d0f50a8582b33fa3f0
Monotone-Revision: 6eabcf880fa6d4620fb9a1ed111b15bef9bd9877
Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-07-11T14:08:51
Monotone-Branch: ca.inverse.sogo
2012-07-11 14:08:51 +00:00