Commit graph

3529 commits

Author SHA1 Message Date
Francis Lachapelle 012e59468d See ChangeLog.
Monotone-Parent: ae85556f790a11b8a40593a88822bee09e847d96
Monotone-Revision: aa6dd506e01700aaff3aa383fbe31691b0d8c795

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-04T19:47:36
2012-06-04 19:47:36 +00:00
Francis Lachapelle 939eeba1f7 See ChangeLog.
Monotone-Parent: d6ace8d3429bf9ad569fff969474bd5aa01214ae
Monotone-Revision: ae85556f790a11b8a40593a88822bee09e847d96

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-04T15:29:38
2012-06-04 15:29:38 +00:00
Wolfgang Sourdeau b4d8609236 Monotone-Parent: c8921f898d8810ab70f86851a0449a28dc34eb89
Monotone-Revision: ccc94ebd9d872963c33041a7cac766343762bef2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T15:15:30
Monotone-Branch: ca.inverse.sogo
2012-06-01 15:15:30 +00:00
Francis Lachapelle 33bb7e5556 merge of '40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768'
and 'f542ae0ee839e825fc2f1dae6c5d916237edb3e4'

Monotone-Parent: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768
Monotone-Parent: f542ae0ee839e825fc2f1dae6c5d916237edb3e4
Monotone-Revision: d6ace8d3429bf9ad569fff969474bd5aa01214ae

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-01T14:30:06
2012-06-01 14:30:06 +00:00
Francis Lachapelle 2c9a61f0c5 See ChangeLog
Monotone-Parent: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0
Monotone-Revision: f542ae0ee839e825fc2f1dae6c5d916237edb3e4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-06-01T14:29:30
2012-06-01 14:29:30 +00:00
Wolfgang Sourdeau fd7f15c81e Monotone-Parent: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0
Monotone-Revision: 40b7c19f2c07d8bd5fbb6e2cc45cba387e15d768

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T14:22:28
2012-06-01 14:22:28 +00:00
Wolfgang Sourdeau 9e842e7277 Monotone-Parent: 9471287ef57b6223c0e3a175d74fc5f6b9ebc42f
Monotone-Revision: 6a6bbe9da76e6e30fd9ce63cf4a8c7677f5f61a0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-01T13:54:52
2012-06-01 13:54:52 +00:00
Ludovic Marcotte efb4e99fec See ChangeLog
Monotone-Parent: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da
Monotone-Revision: 743c613acf2129a221bf3026f94cba3d33fa64c8

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T16:25:31
2012-05-31 16:25:31 +00:00
Ludovic Marcotte ed67384586 See ChangeLog
Monotone-Parent: b5d91e74f183ad54e2362119b25b4556f810e3b6
Monotone-Revision: fa6f3f2b467eaa14a01fb8a7dc2aee1e5e4191da

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T14:51:18
2012-05-31 14:51:18 +00:00
Ludovic Marcotte f2b455fffc See ChangeLog
Monotone-Parent: 3c4baa92c5634d4da061da739a9b544d04c44586
Monotone-Revision: b5d91e74f183ad54e2362119b25b4556f810e3b6

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T14:22:34
2012-05-31 14:22:34 +00:00
Ludovic Marcotte 08230b33bb See ChangeLog
Monotone-Parent: 747fe8c2134a990c1cdf3b494c2b7776021cb736
Monotone-Revision: 3c4baa92c5634d4da061da739a9b544d04c44586

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T13:24:32
2012-05-31 13:24:32 +00:00
Ludovic Marcotte 18ffca1924 See ChangeLog
Monotone-Parent: d29498142c4a9f1d780373bd5f0d80b17f6e2c33
Monotone-Revision: 747fe8c2134a990c1cdf3b494c2b7776021cb736

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-31T12:36:00
2012-05-31 12:36:00 +00:00
Francis Lachapelle 66c972eb97 See ChangeLog.
Monotone-Parent: 28cde64403e65a1ebeda3a984650fd31d8614f29
Monotone-Revision: f51ae70ff345179926dfdd4fd5856e968bdfc327

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-29T14:31:14
2012-05-29 14:31:14 +00:00
Francis Lachapelle 19ea16d5ba See ChangeLog.
Monotone-Parent: 0bc4e04aaead15b626a732a223ebf47ee22e73f0
Monotone-Revision: 28cde64403e65a1ebeda3a984650fd31d8614f29

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-29T14:20:06
2012-05-29 14:20:06 +00:00
Francis Lachapelle 439248ee89 See ChangeLog.
Monotone-Parent: a7e3713b79d3ec5043152d79550eec23b2ff854f
Monotone-Revision: 0bc4e04aaead15b626a732a223ebf47ee22e73f0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-28T20:30:35
2012-05-28 20:30:35 +00:00
Jean Raby 6aed6c5ed0 * debian*/rules: Restart sogod after pkg upgrade (dh_installinit -R)
* Scripts/sogo-init.d-*: add support for conditional restart.
    Patch from Romain Le Disez
  * sogo.spec: Restart sogod during post installation if it was already running

Monotone-Parent: 7fa995267c41300aff7187361273b7fe03da3809
Monotone-Revision: a7e3713b79d3ec5043152d79550eec23b2ff854f

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-24T18:09:47
2012-05-24 18:09:47 +00:00
Jean Raby 9bd903e945 * Apache/SOGo.conf:
Use mod_expires to allow long term caching of static content. (1 year)
  Note that from now on, a resource's URL _must_ change to let the client
  reload it.  This is now done automatically for 'rsrc' in the wox templates,
  but must be done manually for files referenced from css and js.

Monotone-Parent: 217d9d9c614ee3505938f345452c5569bb650a58
Monotone-Revision: 7fa995267c41300aff7187361273b7fe03da3809

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-24T15:38:24
2012-05-24 15:38:24 +00:00
Wolfgang Sourdeau 782cf503af Monotone-Parent: 8c8a0d34571f1ad215b38b68796cff75b4bb787e
Monotone-Revision: 217d9d9c614ee3505938f345452c5569bb650a58

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-23T20:05:00
Monotone-Branch: ca.inverse.sogo
2012-05-23 20:05:00 +00:00
Jean Raby bc19c9bf28 propagate from branch 'ca.inverse.sogo.1_3_15' (head a4d3a18ad2c918187328e23c7ab29824357cd199)
to branch 'ca.inverse.sogo' (head c8046798bce0f997bfa345dc5831f718d02a2638)

Monotone-Parent: a4d3a18ad2c918187328e23c7ab29824357cd199
Monotone-Parent: c8046798bce0f997bfa345dc5831f718d02a2638
Monotone-Revision: 4139bd440f7c28fd59a0685b4ac2ca439778d5bf

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-18T15:04:39
Monotone-Branch: ca.inverse.sogo
2012-05-18 15:04:39 +00:00
Jean Raby 395a1b16e1 * SoObjects/Mailer/SOGoDraftObject.m (bodyPartForAttachmentWithName):
Merge back lost code to handle encoding of binary and rcf822 attachments.

Monotone-Parent: e4c701f2293beb98253d68bb64b7fa0133b1dda5
Monotone-Revision: a4d3a18ad2c918187328e23c7ab29824357cd199

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-18T15:02:42
2012-05-18 15:02:42 +00:00
Jean Raby ea15cb5055 propagate from branch 'ca.inverse.sogo.1_3_15' (head 1f2bd4b4727f3158ab77ca76322cd555967d326a)
to branch 'ca.inverse.sogo' (head 3c99de4fc0fd90e4716ce18b2354e46dc72159ec)

Monotone-Parent: 1f2bd4b4727f3158ab77ca76322cd555967d326a
Monotone-Parent: 3c99de4fc0fd90e4716ce18b2354e46dc72159ec
Monotone-Revision: 471dc0f5e3b2a6fc571aca4e14c0a5161cf7af0b

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-15T14:40:37
Monotone-Branch: ca.inverse.sogo
2012-05-15 14:40:37 +00:00
Jean Raby 9b814bc58c * SoObjects/Appointments/SOGoAppointmentObject.m (_handleResourcesConflicts):
Deny access to resources if the resource's ACL don't allow the organizer
  to read its freebusy info.
  Without this, sogo would always auto-accept invitations from 'unprivileged'
  users, potentially bypassing the multiplebooking parameter.

Monotone-Parent: 8ac367dca61f0a4a66df59c7c786dd0f5016050d
Monotone-Revision: 1f2bd4b4727f3158ab77ca76322cd555967d326a

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-15T14:36:52
2012-05-15 14:36:52 +00:00
Wolfgang Sourdeau ec6d36656b Monotone-Parent: fa858afb28392ab411b14c34ac2889901bc0e49a
Monotone-Revision: 22cbe59df1fd7bc7e696537291a1822e5d95e2f1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-15T13:24:04
Monotone-Branch: ca.inverse.sogo
2012-05-15 13:24:04 +00:00
Wolfgang Sourdeau 214030da9a Monotone-Parent: f4084f570506f57a1c5cce79d74ec2112e81733e
Monotone-Revision: b458e410b31539173b547c1c563f0b7ce41f6252

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T20:20:26
Monotone-Branch: ca.inverse.sogo
2012-05-14 20:20:26 +00:00
Wolfgang Sourdeau 7895169695 propagate from branch 'ca.inverse.sogo.1_3_15' (head 4806c2af0bd085e4a9d26b15d540681d4a14cb0a)
to branch 'ca.inverse.sogo' (head 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9)

Monotone-Parent: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9
Monotone-Parent: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a
Monotone-Revision: 2978fb164d72d09703322ba90dde130c04b410b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:06:30
Monotone-Branch: ca.inverse.sogo
2012-05-14 19:06:30 +00:00
Wolfgang Sourdeau 5fba279690 Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0
Monotone-Revision: 4806c2af0bd085e4a9d26b15d540681d4a14cb0a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:06:28
2012-05-14 19:06:28 +00:00
Wolfgang Sourdeau 88065426fe propagate from branch 'ca.inverse.sogo.1_3_15' (head 908e524c769a51dae0dcb912328a3f394bff90c0)
to branch 'ca.inverse.sogo' (head 60ad1ae0d352bd61f6595c24b454acb729bdaadf)

Monotone-Parent: 60ad1ae0d352bd61f6595c24b454acb729bdaadf
Monotone-Parent: 908e524c769a51dae0dcb912328a3f394bff90c0
Monotone-Revision: 16aec26ecea8175e4cfbd9c57753b8ecc71fafe9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:04:17
Monotone-Branch: ca.inverse.sogo
2012-05-14 19:04:17 +00:00
Wolfgang Sourdeau 782709f0a7 Monotone-Parent: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2
Monotone-Revision: 908e524c769a51dae0dcb912328a3f394bff90c0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T19:04:11
2012-05-14 19:04:11 +00:00
Wolfgang Sourdeau f5ea18a605 propagate from branch 'ca.inverse.sogo.1_3_15' (head 4158f1d28c04b0be7b69ff93cf2e4b055de655a2)
to branch 'ca.inverse.sogo' (head 115d1815352fd6df1b6effd9e0c7adea24a0b9cf)

Monotone-Parent: 115d1815352fd6df1b6effd9e0c7adea24a0b9cf
Monotone-Parent: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2
Monotone-Revision: 60ad1ae0d352bd61f6595c24b454acb729bdaadf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T17:11:42
Monotone-Branch: ca.inverse.sogo
2012-05-14 17:11:42 +00:00
Wolfgang Sourdeau 94aa42a4ab merge of 'bb27badf50d6df9168d73f3e08a4f10ce3626700'
and 'd63fe31c81597a22c53b5925bcf6bca60fc0e252'

Monotone-Parent: bb27badf50d6df9168d73f3e08a4f10ce3626700
Monotone-Parent: d63fe31c81597a22c53b5925bcf6bca60fc0e252
Monotone-Revision: 4158f1d28c04b0be7b69ff93cf2e4b055de655a2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T17:11:33
2012-05-14 17:11:33 +00:00
Wolfgang Sourdeau 364b9f3d61 Monotone-Parent: d4a2b559c00ba43032aff09497fe8be50f429e21
Monotone-Revision: bb27badf50d6df9168d73f3e08a4f10ce3626700

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-14T17:11:10
2012-05-14 17:11:10 +00:00
Jean Raby 433e3d8042 propagate from branch 'ca.inverse.sogo.1_3_15' (head 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3)
to branch 'ca.inverse.sogo' (head 08910689dba5aa9bedbc810bbd626ad6d2f21db1)

Monotone-Parent: 08910689dba5aa9bedbc810bbd626ad6d2f21db1
Monotone-Parent: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3
Monotone-Revision: f30a499d50e08156f7d331ab40080bbad55c19f3

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T16:22:05
Monotone-Branch: ca.inverse.sogo
2012-05-11 16:22:05 +00:00
Jean Raby 6ad52fe047 * SoObjects/Appointments/SOGoAppointmentObject.m (PUTAction):
Delete bitrotten code that could end up duplicating attendees.
  Behavior exposed by the new caldav tests

  * Tests/Integration/config.py.in
  * Tests/Integration/test-caldav-scheduling.py
  * Tests/Integration/test-ical.py
  * Tests/Integration/test-davacl.py:
  Use an unprivileged webdavclient where possible.
  This would have uncovered the resources calendar autocreation bug.

  * Tests/Integration/test-caldav-scheduling.py:
  New tests to excercise somewhat fragile code in dav autoscheduling.

Monotone-Parent: 82335b9404ce69f30e311f831868f8d13e598a46
Monotone-Revision: 1ed6d11b3a404920b5f62a1b03c4a035d5bd53b3

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-11T16:20:45
2012-05-11 16:20:45 +00:00
Jean Raby 7083df2d28 propagate from branch 'ca.inverse.sogo.1_3_15' (head 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4)
to branch 'ca.inverse.sogo' (head 6ae7fe046a4b2457859b40e2f1ce7af496af87f2)

Monotone-Parent: 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4
Monotone-Parent: 6ae7fe046a4b2457859b40e2f1ce7af496af87f2
Monotone-Revision: d130ee40b503d518a809601b1cab53710dbeea4b

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-09T17:49:33
Monotone-Branch: ca.inverse.sogo
2012-05-09 17:49:33 +00:00
Jean Raby 9e65b8b3e4 * SoObject/SOGo/SOGoParentFolder.m (_createPersonalFolder):
Automatically create the folder if its owner is a resource.
    (not if the active user is a resource)

Monotone-Parent: 4a872122da5acff4772feafceee7decf55c1bd98
Monotone-Revision: 6857ec31df4746fa033c80de4b53d7d7e0a4b9e4

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-09T17:48:51
2012-05-09 17:48:51 +00:00
Wolfgang Sourdeau 54c69836ab propagate from branch 'ca.inverse.sogo.1_3_15' (head d4a2b559c00ba43032aff09497fe8be50f429e21)
to branch 'ca.inverse.sogo' (head a7e1ea6582c544441d18a19cd60774003d863f46)

Monotone-Parent: a7e1ea6582c544441d18a19cd60774003d863f46
Monotone-Parent: d4a2b559c00ba43032aff09497fe8be50f429e21
Monotone-Revision: b2d9259d01bec3e1e78582b987d4091f8472b129

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-09T15:24:16
Monotone-Branch: ca.inverse.sogo
2012-05-09 15:24:16 +00:00
Ludovic Marcotte b4d661bb01 merge of '4e44cee96e74269b692d100a0c98730015a49d07'
and 'ee535991d8282dcec82a7f59c0d07efbbddada4f'

Monotone-Parent: 4e44cee96e74269b692d100a0c98730015a49d07
Monotone-Parent: ee535991d8282dcec82a7f59c0d07efbbddada4f
Monotone-Revision: d4a2b559c00ba43032aff09497fe8be50f429e21

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T10:54:14
2012-05-09 10:54:14 +00:00
Francis Lachapelle 61a2a4a7ee See ChangeLog.
Monotone-Parent: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0
Monotone-Revision: ee535991d8282dcec82a7f59c0d07efbbddada4f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-09T13:31:20
2012-05-09 13:31:20 +00:00
Ludovic Marcotte 93dd01d271 See ChangeLog
Monotone-Parent: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0
Monotone-Revision: 4e44cee96e74269b692d100a0c98730015a49d07

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-05-09T10:52:36
2012-05-09 10:52:36 +00:00
Francis Lachapelle 60555b9568 See ChangeLog.
Monotone-Parent: dcd831afcbb347de38ec00c05b919923433a9f1f
Monotone-Revision: dbb4d0d0fcdbbccb83eb0faf29ecfd26bb48dbc0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-05-08T18:58:57
2012-05-08 18:58:57 +00:00
Wolfgang Sourdeau 905c635774 Monotone-Parent: 63e5b1e4803ea8f6e3495f26b87df7a20d1ee379
Monotone-Revision: 8820ab3233ed6f1bdd0c2a203ea8208f8410f3bd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-05T03:01:23
Monotone-Branch: ca.inverse.sogo
2012-05-05 03:01:23 +00:00
Wolfgang Sourdeau e082ce8cf8 propagate from branch 'ca.inverse.sogo.1_3_15' (head 546030b7b1310706d148f176ba3f7dfa1f1138b1)
to branch 'ca.inverse.sogo' (head c5348bb50866672a86152eb3750bed29a4be1e3b)

Monotone-Parent: 546030b7b1310706d148f176ba3f7dfa1f1138b1
Monotone-Parent: c5348bb50866672a86152eb3750bed29a4be1e3b
Monotone-Revision: 63e5b1e4803ea8f6e3495f26b87df7a20d1ee379

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T18:38:43
Monotone-Branch: ca.inverse.sogo
2012-05-01 18:38:43 +00:00
Wolfgang Sourdeau a4358ab02b Monotone-Parent: 0e5184582f5d3e24e8418e6c09048eb31dd79c83
Monotone-Revision: 546030b7b1310706d148f176ba3f7dfa1f1138b1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T18:38:40
2012-05-01 18:38:40 +00:00
Wolfgang Sourdeau cc1989d6de propagate from branch 'ca.inverse.sogo.1_3_15' (head 0e5184582f5d3e24e8418e6c09048eb31dd79c83)
to branch 'ca.inverse.sogo' (head dd015385747c68da0ce2d9fb49137db55e3bb32e)

Monotone-Parent: 0e5184582f5d3e24e8418e6c09048eb31dd79c83
Monotone-Parent: dd015385747c68da0ce2d9fb49137db55e3bb32e
Monotone-Revision: c5348bb50866672a86152eb3750bed29a4be1e3b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T17:03:22
Monotone-Branch: ca.inverse.sogo
2012-05-01 17:03:22 +00:00
Wolfgang Sourdeau 08b23ed95e Monotone-Parent: e9e3e99e5c78c811e3e5cb0f4742380c31e1e44c
Monotone-Revision: 0e5184582f5d3e24e8418e6c09048eb31dd79c83

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T17:03:14
2012-05-01 17:03:14 +00:00
Wolfgang Sourdeau cc9781a090 propagate from branch 'ca.inverse.sogo.1_3_15' (head 373797dc3c245bb7e5c9f47af99935f50e79dc16)
to branch 'ca.inverse.sogo' (head 388fbe7a186b5078c0f26161280ef319963b910d)

Monotone-Parent: 373797dc3c245bb7e5c9f47af99935f50e79dc16
Monotone-Parent: 388fbe7a186b5078c0f26161280ef319963b910d
Monotone-Revision: 919d33c3134c9977564cf2d69e21be184850a819

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:49:40
Monotone-Branch: ca.inverse.sogo
2012-05-01 14:49:40 +00:00
Wolfgang Sourdeau d4c34cb481 Whitespaces
Monotone-Parent: bfe92d024d362b0f22f21f877f8e6518e00ab543
Monotone-Revision: 373797dc3c245bb7e5c9f47af99935f50e79dc16

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:49:19
2012-05-01 14:49:19 +00:00
Wolfgang Sourdeau f8b55543e0 Monotone-Parent: ebefc72cf1f85cf9726bac12a387a3b5d92e0945
Monotone-Revision: bfe92d024d362b0f22f21f877f8e6518e00ab543

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-05-01T14:47:20
2012-05-01 14:47:20 +00:00
Ludovic Marcotte e054f972a2 propagate from branch 'ca.inverse.sogo.1_3_15' (head 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9)
to branch 'ca.inverse.sogo' (head 1a746e7d8ab981f6bbfb22f428fe19cc085bd285)

Monotone-Parent: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285
Monotone-Parent: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9
Monotone-Revision: 388fbe7a186b5078c0f26161280ef319963b910d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T17:19:23
Monotone-Branch: ca.inverse.sogo
2012-04-30 17:19:23 +00:00
Ludovic Marcotte c290e70342 See ChangeLog
Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Revision: 7d1f68d661b9fcfd676be1e6d3d6ce6c1fb09df9

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T17:19:00
2012-04-30 17:19:00 +00:00
Ludovic Marcotte 26240ad737 propagate from branch 'ca.inverse.sogo.1_3_15' (head 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f)
to branch 'ca.inverse.sogo' (head 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778)

Monotone-Parent: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f
Monotone-Parent: 9d7f0e2a2a1a65c1d0e27552dc78e4ee46c13778
Monotone-Revision: 1a746e7d8ab981f6bbfb22f428fe19cc085bd285

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T09:50:35
Monotone-Branch: ca.inverse.sogo
2012-04-30 09:50:35 +00:00
Ludovic Marcotte 19540fada1 See ChangeLog
Monotone-Parent: c64050fc650935a4d7620ed869e3e3863b178c1e
Monotone-Revision: 4e2b45bb5b0360d8cf107846fa39fb12f6bacf7f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-30T09:50:10
2012-04-30 09:50:10 +00:00
Francis Lachapelle be5a16e3fb merge of '2a87115bccec235f2a2e55f0bc7710d46e961afd'
and '2fc38e65f96b51fa85b4171735f3413808da5422'

Monotone-Parent: 2a87115bccec235f2a2e55f0bc7710d46e961afd
Monotone-Parent: 2fc38e65f96b51fa85b4171735f3413808da5422
Monotone-Revision: 2828658dbefac205b7160b9ca55913b64dacacd6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-26T12:28:44
Monotone-Branch: ca.inverse.sogo
2012-04-26 12:28:44 +00:00
Francis Lachapelle a8c28faeb7 merge of '402b5b43e7c75b50806b41e7372eed0e61a4de9f'
and '4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea'

Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f
Monotone-Parent: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea
Monotone-Revision: 06f33f8f7c4581f3ec39d5cce6e3b77a99d436b0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-26T12:28:08
2012-04-26 12:28:08 +00:00
Jean Raby 24e6f4ed7c propagate from branch 'ca.inverse.sogo.1_3_15' (head 402b5b43e7c75b50806b41e7372eed0e61a4de9f)
to branch 'ca.inverse.sogo' (head aaa516c8e0f7391e21eda557b30eb4c3c80b14bc)

Monotone-Parent: 402b5b43e7c75b50806b41e7372eed0e61a4de9f
Monotone-Parent: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc
Monotone-Revision: 2fc38e65f96b51fa85b4171735f3413808da5422

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-04-25T21:36:03
Monotone-Branch: ca.inverse.sogo
2012-04-25 21:36:03 +00:00
Jean Raby 49a74909d7 * SoObjects/Mailer/SOGoDraftObject.m (-updateFromLDIFRecord:):
carry the c_info attribute in vcards through the x-sogo-contactinfo attribute.
  This functionality was lost a while ago.
  We used to use the NOTE attribute for this. From now on,
  the sogo-connector.autoComplete.commentAttribute have to be set to
  'unprocessed:x-sogo-contactinfo' instead of 'Notes'.

Monotone-Parent: d8a0de208631b406144e740ab09b4e5a92f0e66c
Monotone-Revision: 402b5b43e7c75b50806b41e7372eed0e61a4de9f

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-04-25T21:35:29
2012-04-25 21:35:29 +00:00
Wolfgang Sourdeau 3b8fb5d0be propagate from branch 'ca.inverse.sogo.1_3_15' (head 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea)
to branch 'ca.inverse.sogo' (head aaa516c8e0f7391e21eda557b30eb4c3c80b14bc)

Monotone-Parent: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea
Monotone-Parent: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc
Monotone-Revision: 2a87115bccec235f2a2e55f0bc7710d46e961afd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-25T21:32:36
Monotone-Branch: ca.inverse.sogo
2012-04-25 21:32:36 +00:00
Wolfgang Sourdeau 5b59ebfe11 Monotone-Parent: d8a0de208631b406144e740ab09b4e5a92f0e66c
Monotone-Revision: 4d091aae297e1a3ea2ef11b35c1df5c2c60c6fea

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-25T21:32:18
2012-04-25 21:32:18 +00:00
Wolfgang Sourdeau f27440653f propagate from branch 'ca.inverse.sogo.1_3_15' (head d8a0de208631b406144e740ab09b4e5a92f0e66c)
to branch 'ca.inverse.sogo' (head 356e7649cb18120413fdf16e371d74fbcd28c3e1)

Monotone-Parent: 356e7649cb18120413fdf16e371d74fbcd28c3e1
Monotone-Parent: d8a0de208631b406144e740ab09b4e5a92f0e66c
Monotone-Revision: aaa516c8e0f7391e21eda557b30eb4c3c80b14bc

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-25T20:56:41
Monotone-Branch: ca.inverse.sogo
2012-04-25 20:56:41 +00:00
Wolfgang Sourdeau f7e9f2fc7d Monotone-Parent: 2cc377d2c23e8b670331c8dffc558d00e9cf7e62
Monotone-Revision: d8a0de208631b406144e740ab09b4e5a92f0e66c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-25T20:56:14
2012-04-25 20:56:14 +00:00
Wolfgang Sourdeau dcef24cc15 propagate from branch 'ca.inverse.sogo.1_3_15' (head 9cc6d172992d23b089ad2377f66d83c176dc0fed)
to branch 'ca.inverse.sogo' (head 21360eb0c3f218f331f1eba36a06224f3429cd91)

Monotone-Parent: 21360eb0c3f218f331f1eba36a06224f3429cd91
Monotone-Parent: 9cc6d172992d23b089ad2377f66d83c176dc0fed
Monotone-Revision: 356e7649cb18120413fdf16e371d74fbcd28c3e1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T18:00:56
Monotone-Branch: ca.inverse.sogo
2012-04-24 18:00:56 +00:00
Wolfgang Sourdeau ca8fbfe942 Monotone-Parent: a67a6a3249b2b6a4b199678bc6f32cad47300639
Monotone-Revision: 9cc6d172992d23b089ad2377f66d83c176dc0fed

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T18:00:49
2012-04-24 18:00:49 +00:00
Wolfgang Sourdeau 35314b13d3 propagate from branch 'ca.inverse.sogo.1_3_15' (head a67a6a3249b2b6a4b199678bc6f32cad47300639)
to branch 'ca.inverse.sogo' (head bc199d3fb5947e961f9d63c20b6f2d472cdaff0d)

Monotone-Parent: a67a6a3249b2b6a4b199678bc6f32cad47300639
Monotone-Parent: bc199d3fb5947e961f9d63c20b6f2d472cdaff0d
Monotone-Revision: 21360eb0c3f218f331f1eba36a06224f3429cd91

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T17:42:22
Monotone-Branch: ca.inverse.sogo
2012-04-24 17:42:22 +00:00
Wolfgang Sourdeau 45a9a751ea Monotone-Parent: 4351ae4fc2e351a77cbb70655cd3da5ab2af66c7
Monotone-Revision: a67a6a3249b2b6a4b199678bc6f32cad47300639

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T17:42:16
2012-04-24 17:42:16 +00:00
Wolfgang Sourdeau d0409c79ca Monotone-Parent: 5444115146b03d377270a0ee98d9e240781fcc6e
Monotone-Revision: 4351ae4fc2e351a77cbb70655cd3da5ab2af66c7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T17:40:52
2012-04-24 17:40:52 +00:00
Wolfgang Sourdeau 4873197e55 propagate from branch 'ca.inverse.sogo.1_3_15' (head 5444115146b03d377270a0ee98d9e240781fcc6e)
to branch 'ca.inverse.sogo' (head 1a1393f78ba372cce09b37d46908cc3e7553d869)

Monotone-Parent: 1a1393f78ba372cce09b37d46908cc3e7553d869
Monotone-Parent: 5444115146b03d377270a0ee98d9e240781fcc6e
Monotone-Revision: bc199d3fb5947e961f9d63c20b6f2d472cdaff0d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T15:32:14
Monotone-Branch: ca.inverse.sogo
2012-04-24 15:32:14 +00:00
Wolfgang Sourdeau 781f3fbf7e Monotone-Parent: fc9e1cf3f4988bae25443b6d072add3f344d30f0
Monotone-Revision: 5444115146b03d377270a0ee98d9e240781fcc6e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-24T15:32:10
2012-04-24 15:32:10 +00:00
Ludovic Marcotte fc7157b3dc propagate from branch 'ca.inverse.sogo.1_3_15' (head fc9e1cf3f4988bae25443b6d072add3f344d30f0)
to branch 'ca.inverse.sogo' (head 6331064cc925005acad759e8c6eac99b6b7071cd)

Monotone-Parent: 6331064cc925005acad759e8c6eac99b6b7071cd
Monotone-Parent: fc9e1cf3f4988bae25443b6d072add3f344d30f0
Monotone-Revision: 1a1393f78ba372cce09b37d46908cc3e7553d869

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-24T11:48:06
Monotone-Branch: ca.inverse.sogo
2012-04-24 11:48:06 +00:00
Ludovic Marcotte c774314b1b See ChangeLog
Monotone-Parent: cd39fe0df424d1e5afd5dcfa4b1c94ad707fed24
Monotone-Revision: fc9e1cf3f4988bae25443b6d072add3f344d30f0

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-24T11:47:32
2012-04-24 11:47:32 +00:00
Ludovic Marcotte f481b14fb7 propagate from branch 'ca.inverse.sogo.1_3_15' (head 64488d85ff930e32a07eda3c4ce9ae01e7513fc8)
to branch 'ca.inverse.sogo' (head b2a750dba2c2bf3d145e44d412e5a647e552cf59)

Monotone-Parent: 64488d85ff930e32a07eda3c4ce9ae01e7513fc8
Monotone-Parent: b2a750dba2c2bf3d145e44d412e5a647e552cf59
Monotone-Revision: c663ade92bbaf8f47fdf0c3e5d6b9b631ac684d5

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-23T12:59:31
Monotone-Branch: ca.inverse.sogo
2012-04-23 12:59:31 +00:00
Ludovic Marcotte 63560c5678 See ChangeLog
Monotone-Parent: e290d09c6fe813e82f2e06c1cfcaab7ba2a5b3ac
Monotone-Revision: 64488d85ff930e32a07eda3c4ce9ae01e7513fc8

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-23T12:58:56
2012-04-23 12:58:56 +00:00
Wolfgang Sourdeau 6b8d737ee7 propagate from branch 'ca.inverse.sogo.1_3_15' (head d0d8f431bd9bb7676b29e0f9073ed40cfc1cf9e5)
to branch 'ca.inverse.sogo' (head 7da6a3fd504496abb13e361b594cd5dfd33ee4f9)

Monotone-Parent: 7da6a3fd504496abb13e361b594cd5dfd33ee4f9
Monotone-Parent: d0d8f431bd9bb7676b29e0f9073ed40cfc1cf9e5
Monotone-Revision: 5b71abea869d3dd01b8df42afd8c6631b75ce2db

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T16:11:24
Monotone-Branch: ca.inverse.sogo
2012-04-20 16:11:24 +00:00
Wolfgang Sourdeau e406c4b028 Monotone-Parent: b58773ad261dd708b850c5cd63f53133730d2c59
Monotone-Revision: d0d8f431bd9bb7676b29e0f9073ed40cfc1cf9e5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T16:11:21
2012-04-20 16:11:21 +00:00
Wolfgang Sourdeau 44258debd7 propagate from branch 'ca.inverse.sogo.1_3_15' (head 015d6494690201ec056395687392e68803e04210)
to branch 'ca.inverse.sogo' (head 65f631c9b4cbbbd4d2a762d4c2e1a7cd8c3f77da)

Monotone-Parent: 015d6494690201ec056395687392e68803e04210
Monotone-Parent: 65f631c9b4cbbbd4d2a762d4c2e1a7cd8c3f77da
Monotone-Revision: 2e0ada753c27578808142ee65c32d3210cce9562

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T14:39:09
Monotone-Branch: ca.inverse.sogo
2012-04-20 14:39:09 +00:00
Wolfgang Sourdeau 1bfbe3afe9 Monotone-Parent: ac0d12f89b420e5f1e825cebddb440417e76ce4b
Monotone-Revision: 015d6494690201ec056395687392e68803e04210

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T14:37:53
2012-04-20 14:37:53 +00:00
Wolfgang Sourdeau c83ad28b98 propagate from branch 'ca.inverse.sogo.1_3_15' (head ac0d12f89b420e5f1e825cebddb440417e76ce4b)
to branch 'ca.inverse.sogo' (head bf8352a50cfe2d3a45e91ddab8085ef9f724a1f1)

Monotone-Parent: ac0d12f89b420e5f1e825cebddb440417e76ce4b
Monotone-Parent: bf8352a50cfe2d3a45e91ddab8085ef9f724a1f1
Monotone-Revision: 65f631c9b4cbbbd4d2a762d4c2e1a7cd8c3f77da

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:37:53
Monotone-Branch: ca.inverse.sogo
2012-04-20 13:37:53 +00:00
Wolfgang Sourdeau 2346d35d21 Monotone-Parent: 0869cb2e3bedff16fb0985d9bde1c2c2a5c80820
Monotone-Revision: ac0d12f89b420e5f1e825cebddb440417e76ce4b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:37:46
2012-04-20 13:37:46 +00:00
Wolfgang Sourdeau f306ab6a71 merge of '2684d8c1336cad3425d5075a447d817d5808948d'
and '7786f49f6724383b92e91ba7998b99cfb52ceec3'

Monotone-Parent: 2684d8c1336cad3425d5075a447d817d5808948d
Monotone-Parent: 7786f49f6724383b92e91ba7998b99cfb52ceec3
Monotone-Revision: 0869cb2e3bedff16fb0985d9bde1c2c2a5c80820

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:27:55
2012-04-20 13:27:55 +00:00
Wolfgang Sourdeau fa4d2d3141 Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168
Monotone-Revision: 7786f49f6724383b92e91ba7998b99cfb52ceec3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-20T13:27:21
2012-04-20 13:27:21 +00:00
Wolfgang Sourdeau 9ea333e6b6 merge of '3df4271ffa54be2fdec6fa5cc5170ed38c1e01df'
and '407012b144380da01f4b13cfb23faba545da887a'

Monotone-Parent: 3df4271ffa54be2fdec6fa5cc5170ed38c1e01df
Monotone-Parent: 407012b144380da01f4b13cfb23faba545da887a
Monotone-Revision: f90d169fbc251326ea6c8a2f620e125a8a7b4168

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T19:04:07
2012-04-19 19:04:07 +00:00
Ludovic Marcotte c1bc3dd07a propagate from branch 'ca.inverse.sogo.1_3_15' (head 2684d8c1336cad3425d5075a447d817d5808948d)
to branch 'ca.inverse.sogo' (head 2c06aa8a1cf91d9b82baa03d74b1ed5f713b7fcb)

Monotone-Parent: 2684d8c1336cad3425d5075a447d817d5808948d
Monotone-Parent: 2c06aa8a1cf91d9b82baa03d74b1ed5f713b7fcb
Monotone-Revision: bf8352a50cfe2d3a45e91ddab8085ef9f724a1f1

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-19T18:17:18
Monotone-Branch: ca.inverse.sogo
2012-04-19 18:17:18 +00:00
Ludovic Marcotte ce77d78e27 See ChangeLog
Monotone-Parent: 5af155533446328556c907456566939affd0ae8f
Monotone-Revision: 2684d8c1336cad3425d5075a447d817d5808948d

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-19T18:16:50
2012-04-19 18:16:50 +00:00
Ludovic Marcotte 3d2707beaa propagate from branch 'ca.inverse.sogo.1_3_15' (head 5af155533446328556c907456566939affd0ae8f)
to branch 'ca.inverse.sogo' (head 7b006a3f6a830fdc6f0f12c3e086fc05204930cf)

Monotone-Parent: 5af155533446328556c907456566939affd0ae8f
Monotone-Parent: 7b006a3f6a830fdc6f0f12c3e086fc05204930cf
Monotone-Revision: 2c06aa8a1cf91d9b82baa03d74b1ed5f713b7fcb

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-19T16:30:23
Monotone-Branch: ca.inverse.sogo
2012-04-19 16:30:23 +00:00
Wolfgang Sourdeau 1f03d418b3 propagate from branch 'ca.inverse.sogo.1_3_15' (head f90d169fbc251326ea6c8a2f620e125a8a7b4168)
to branch 'ca.inverse.sogo' (head 7a9088c9a9d28598914a43d54b44dca1365e2897)

Monotone-Parent: 7a9088c9a9d28598914a43d54b44dca1365e2897
Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168
Monotone-Revision: 7b006a3f6a830fdc6f0f12c3e086fc05204930cf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T19:04:50
Monotone-Branch: ca.inverse.sogo
2012-04-19 19:04:50 +00:00
Ludovic Marcotte 0c0cbc19f0 See ChangeLog
Monotone-Parent: f90d169fbc251326ea6c8a2f620e125a8a7b4168
Monotone-Revision: 5af155533446328556c907456566939affd0ae8f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-19T16:29:43
2012-04-19 16:29:43 +00:00
Wolfgang Sourdeau e4f298fee5 propagate from branch 'ca.inverse.sogo.1_3_15' (head 407012b144380da01f4b13cfb23faba545da887a)
to branch 'ca.inverse.sogo' (head 5afcea3436fb34710c1063b99084e3c71ffa1a5c)

Monotone-Parent: 407012b144380da01f4b13cfb23faba545da887a
Monotone-Parent: 5afcea3436fb34710c1063b99084e3c71ffa1a5c
Monotone-Revision: 7a9088c9a9d28598914a43d54b44dca1365e2897

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T14:48:12
Monotone-Branch: ca.inverse.sogo
2012-04-19 14:48:12 +00:00
Wolfgang Sourdeau 6a6982bd89 Monotone-Parent: 605af413c10fbef80e5952f773c4450ffface034
Monotone-Revision: 407012b144380da01f4b13cfb23faba545da887a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T14:48:07
2012-04-19 14:48:07 +00:00
Francis Lachapelle 29aa61f8bd See ChangeLog.
Monotone-Parent: d76454ce94cf2e0cbc0503997f50e243467692ba
Monotone-Revision: 3df4271ffa54be2fdec6fa5cc5170ed38c1e01df

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-04-19T14:24:37
2012-04-19 14:24:37 +00:00
Wolfgang Sourdeau 64d64ac008 propagate from branch 'ca.inverse.sogo.1_3_15' (head 605af413c10fbef80e5952f773c4450ffface034)
to branch 'ca.inverse.sogo' (head f92e3e155f030585d765d28f5eee4696fae2d5c0)

Monotone-Parent: 605af413c10fbef80e5952f773c4450ffface034
Monotone-Parent: f92e3e155f030585d765d28f5eee4696fae2d5c0
Monotone-Revision: 5afcea3436fb34710c1063b99084e3c71ffa1a5c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T13:17:26
Monotone-Branch: ca.inverse.sogo
2012-04-19 13:17:26 +00:00
Wolfgang Sourdeau d2d1c1e104 Monotone-Parent: e93a01f806a40f4a4ff41e64bf05eae122e0eb6a
Monotone-Revision: 605af413c10fbef80e5952f773c4450ffface034

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-19T13:17:16
2012-04-19 13:17:16 +00:00
Ludovic Marcotte 3ff552642f propagate from branch 'ca.inverse.sogo.1_3_15' (head 2b7803f8e993e96ff4490197722ef0a2a5faad70)
to branch 'ca.inverse.sogo' (head 4938b5904dac56f89cbd9c1e57f10aee6ea224e0)

Monotone-Parent: 2b7803f8e993e96ff4490197722ef0a2a5faad70
Monotone-Parent: 4938b5904dac56f89cbd9c1e57f10aee6ea224e0
Monotone-Revision: 53c201da944fae4865d8c023837ade73f6a37bef

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-18T17:40:45
Monotone-Branch: ca.inverse.sogo
2012-04-18 17:40:45 +00:00
Wolfgang Sourdeau 4173896a86 merge of '785de8feba6c3e190c55defa1a5e18e85c9b82ba'
and '9fc56cd3ca7051c4b29662926289d2cb181bc57a'

Monotone-Parent: 785de8feba6c3e190c55defa1a5e18e85c9b82ba
Monotone-Parent: 9fc56cd3ca7051c4b29662926289d2cb181bc57a
Monotone-Revision: 33545be02b741723c3eb86718dc21f534032fc81

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T20:09:02
Monotone-Branch: ca.inverse.sogo
2012-04-18 20:09:02 +00:00
Wolfgang Sourdeau 561bdbb364 propagate from branch 'ca.inverse.sogo.1_3_15' (head a49b4023ef2ea7a4f4040725d21123c9d0858bbf)
to branch 'ca.inverse.sogo' (head c32cff29d1d0d305b798b73f0db514f448a0d44c)

Monotone-Parent: a49b4023ef2ea7a4f4040725d21123c9d0858bbf
Monotone-Parent: c32cff29d1d0d305b798b73f0db514f448a0d44c
Monotone-Revision: 9fc56cd3ca7051c4b29662926289d2cb181bc57a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T20:04:41
Monotone-Branch: ca.inverse.sogo
2012-04-18 20:04:41 +00:00
Wolfgang Sourdeau c804d5ccfe Monotone-Parent: 6303f532fa4bb3c36fe2f298f62f659c4fc71b18
Monotone-Revision: c111ae7ec8c39efb8d0cc56ff4627bb958ff0cc8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T20:03:07
2012-04-18 20:03:07 +00:00
Wolfgang Sourdeau bd982aa4c3 Monotone-Parent: 9af7f3b786a8f22f5ddae91d7aba838abbd724d5
Monotone-Revision: 6303f532fa4bb3c36fe2f298f62f659c4fc71b18

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T19:23:09
2012-04-18 19:23:09 +00:00
Wolfgang Sourdeau 1b99e86910 Monotone-Parent: 2d2d3a51a60fe527ccb060a620cf04792ccfb293
Monotone-Revision: 9af7f3b786a8f22f5ddae91d7aba838abbd724d5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T19:17:59
2012-04-18 19:17:59 +00:00
Wolfgang Sourdeau e18608e58b Monotone-Parent: e7a3d03032fdca1b9564002f83fa7c9947b6cb17
Monotone-Revision: 2d2d3a51a60fe527ccb060a620cf04792ccfb293

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T19:13:26
2012-04-18 19:13:26 +00:00
Wolfgang Sourdeau 6329e6849a Monotone-Parent: 06b78be239198e10c446abc32f48addb0c71d0a2
Monotone-Revision: e7a3d03032fdca1b9564002f83fa7c9947b6cb17

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T19:11:55
2012-04-18 19:11:55 +00:00
Ludovic Marcotte dbd99fac84 See ChangeLog
Monotone-Parent: 8ff4e6d2b420caded81d7317c1170ff6ce35249e
Monotone-Revision: 2b7803f8e993e96ff4490197722ef0a2a5faad70

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2012-04-18T17:39:11
2012-04-18 17:39:11 +00:00
Wolfgang Sourdeau 045363c72e merge of 'a49b4023ef2ea7a4f4040725d21123c9d0858bbf'
and 'bd8544b99b099a3544a5acdb3bdcc8c219709ff1'

Monotone-Parent: a49b4023ef2ea7a4f4040725d21123c9d0858bbf
Monotone-Parent: bd8544b99b099a3544a5acdb3bdcc8c219709ff1
Monotone-Revision: 8ff4e6d2b420caded81d7317c1170ff6ce35249e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-18T20:09:40
2012-04-18 20:09:40 +00:00