/offlineimap/head: changeset 367

Reverted the license change

offlineimap/head/COPYRIGHT

@@ -3,7 +3,8 @@ Copyright (C) 2002, 2003 John Goerzen
 <jgoerzen@complete.org>
    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
-   the Free Software Foundation; version 2 of the License.
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/Makefile

@@ -3,7 +3,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/bin/offlineimap

@@ -5,7 +5,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/debian/copyright

@@ -8,7 +8,8 @@ Copyright (C) 2002, 2003  John Goerzen
 
   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
-  the Free Software Foundation; version 2 of the License.
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/manual.html

@@ -1865,7 +1865,8 @@ NAME="AEN513"
 ><P
 >	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
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
       </P
 ><P
 >	This program is distributed in the hope that it will be useful,

offlineimap/head/manual.ps

@@ -1,6 +1,6 @@
 %!PS-Adobe-3.0
 %%Creator: groff version 1.18.1
-%%CreationDate: Tue Mar  4 14:40:31 2003
+%%CreationDate: Wed Feb  5 14:55:52 2003
 %%DocumentNeededResources: font Times-Roman
 %%+ font Times-Bold
 %%+ font Times-Italic
@@ -375,8 +375,8 @@ F3<2f7573722f73686172>2.755 E<652f646f632f6f66>-.37 E
 E<787420746f>-.15 E F3<7e2f2e6f66>2.5 E<8d696e65696d617072>-.18 E<63>
 -.37 E F0<3a>A<5b67656e6572616c5d>108 686.4 Q<6163636f756e7473203d2054>
 108 698.4 Q<657374>-.7 E<5b54>108 722.4 Q<6573745d>-.7 E
-<4a6f686e20476f65727a656e>72 768 Q<3034204d617263682032303033>148.19 E
+<4a6f686e20476f65727a656e>72 768 Q<30352046656272756172792032303033>
-<31>198.45 E 0 Cg EP
+143.19 E<31>193.45 E 0 Cg EP
 %%Page: 2 2
 %%BeginPageSetup
 BP
@@ -533,8 +533,8 @@ H<6f752077696c6c2074797065>-.45 E F2<6f668d696e65696d6170>2.5 E F0
 652077656273697465203c55524c3a687474703a2f2f717575782e6f72>-.15 F
 <672f6465>-.18 E -.15<7665>-.25 G<6c2f6f66>.15 E<8d696e65696d61702f3e2e>
 -.25 E<5468656e2072756e20746865736520636f6d6d616e64733a>108 710.4 Q
-<4a6f686e20476f65727a656e>72 768 Q<3034204d617263682032303033>148.19 E
+<4a6f686e20476f65727a656e>72 768 Q<30352046656272756172792032303033>
-<32>198.45 E 0 Cg EP
+143.19 E<32>193.45 E 0 Cg EP
 %%Page: 3 3
 %%BeginPageSetup
 BP
@@ -687,8 +687,8 @@ F3<696e74657266616365>2.5 E F0 1.291
 7461626c6520666f7220736372697074696e67206f72206c6f6767696e6720707572706f
 7365732e>-.1 F<546865>5.828 E F3<7569>3.328 E F0 .828<6f7074696f6e20696e
 2074686520636f6e8c6775726174696f6e208c6c652073706563698c65732075736572>
-3.328 F<4a6f686e20476f65727a656e>72 768 Q<3034204d617263682032303033>
+3.328 F<4a6f686e20476f65727a656e>72 768 Q
-148.19 E<33>198.45 E 0 Cg EP
+<30352046656272756172792032303033>143.19 E<33>193.45 E 0 Cg EP
 %%Page: 4 4
 %%BeginPageSetup
 BP
@@ -821,7 +821,7 @@ F<757375616c6c792072656665727320746f20737461747573206c6967687473206f6e20
 <656e206d697420737069747a656e737061726b>-.1 F 2.621<656e2e20497374>-.1 F
 .121<6e696368742066756572206765>2.621 F<7765726b>-.25 E .121
 <656e2062656920646173>-.1 F<4a6f686e20476f65727a656e>72 768 Q
-<3034204d617263682032303033>148.19 E<34>198.45 E 0 Cg EP
+<30352046656272756172792032303033>143.19 E<34>193.45 E 0 Cg EP
 %%Page: 5 5
 %%BeginPageSetup
 BP
@@ -954,8 +954,8 @@ Q<46696e616c6c79>108 633.6 Q 2.5<2c61>-.65 G
 <6f726b2e636f6d22>-.1 E<736574206d626f785f747970653d4d61696c646972>108
 693.6 Q<73657420666f6c6465723d24484f4d452f4d61696c>108 705.6 Q
 <73706f6f6c8c6c653d2b506572736f6e616c2f494e424f>108 717.6 Q<58>-.4 E
-<4a6f686e20476f65727a656e>72 768 Q<3034204d617263682032303033>148.19 E
+<4a6f686e20476f65727a656e>72 768 Q<30352046656272756172792032303033>
-<35>198.45 E 0 Cg EP
+143.19 E<35>193.45 E 0 Cg EP
 %%Page: 6 6
 %%BeginPageSetup
 BP
@@ -1039,8 +1039,8 @@ E<7072696f726974697a6564203d205b27494e424f>108 535.2 Q
 720 R 3.065<7774>-.25 G<6865>-3.065 E F2<666f6c646572>3.065 E<736f7274>
 -.1 E F0 .565<6f7074696f6e2063616e20626520637573746f6d697a65642077697468
 206120507974686f6e2066756e6374696f6e2066726f6d20746865>3.065 F
-<4a6f686e20476f65727a656e>72 768 Q<3034204d617263682032303033>148.19 E
+<4a6f686e20476f65727a656e>72 768 Q<30352046656272756172792032303033>
-<36>198.45 E 0 Cg EP
+143.19 E<36>193.45 E 0 Cg EP
 %%Page: 7 7
 %%BeginPageSetup
 BP
@@ -1195,7 +1195,7 @@ F1<666f6c6465728c6c746572>2.5 E F0
 F0 .21<63616e2068656c702074686573652070726f6772616d73206279207772697469
 6e6720746865206e616d6573206f662074686520666f6c64657273206e69206120666f72
 6d6174>2.71 F<4a6f686e20476f65727a656e>72 768 Q
-<3034204d617263682032303033>148.19 E<37>198.45 E 0 Cg EP
+<30352046656272756172792032303033>143.19 E<37>193.45 E 0 Cg EP
 %%Page: 8 8
 %%BeginPageSetup
 BP
@@ -1324,8 +1324,8 @@ F .506<617265206d616e>3.006 F 3.006<7976>-.15 G .506
 <2e79702e746f2f70726f746f2f6d61696c646972>-.55 E<2e68746d6c3e2e>-.55 E
 10.9<8353>108 696 S<74616e6461726420507974686f6e20322e322e3120617320696d
 706c656d656e746564206f6e20504f5349582d636f6d706c69616e742073797374656d73
-2e>-10.9 E<4a6f686e20476f65727a656e>72 768 Q<3034204d617263682032303033>
+2e>-10.9 E<4a6f686e20476f65727a656e>72 768 Q
-148.19 E<38>198.45 E 0 Cg EP
+<30352046656272756172792032303033>143.19 E<38>193.45 E 0 Cg EP
 %%Page: 9 9
 %%BeginPageSetup
 BP
@@ -1472,36 +1472,39 @@ E F1<434f50595249474854>72 578.4 Q F0<4f66>108 590.4 Q<8d696e65494d4150>
 -.1 E .287<546869732070726f6772616d206973206672656520736f667477>108
 607.2 R .287<6172653b20796f752063616e20726564697374726962>-.1 F .286<75
 746520697420616e642f6f72206d6f6469667920697420756e6465722074686520746572
-6d73206f662074686520474e552047656e6572616c>-.2 F<5075626c6963204c696365
+6d73206f662074686520474e552047656e6572616c>-.2 F .766<5075626c6963204c69
-6e7365206173207075626c697368656420627920746865204672656520536f667477>108
+63656e7365206173207075626c697368656420627920746865204672656520536f667477>
-619.2 Q<6172652046>-.1 E<6f756e646174696f6e3b2076>-.15 E
+108 619.2 R .766<6172652046>-.1 F .766
-<657273696f6e2032206f6620746865204c6963656e73652e>-.15 E .579
+<6f756e646174696f6e3b206569746865722076>-.15 F .766<657273696f6e2032206f
-<546869732070726f6772616d2069732064697374726962>108 636 R .579<75746564
+6620746865204c6963656e73652c206f722028617420796f7572>-.15 F
+<6f7074696f6e2920616e>108 631.2 Q 2.5<796c>-.15 G<617465722076>-2.5 E
+<657273696f6e2e>-.15 E .58
+<546869732070726f6772616d2069732064697374726962>108 648 R .579<75746564
 20696e2074686520686f706520746861742069742077696c6c2062652075736566756c2c
-2062>-.2 F .58<757420574954484f555420414e592057>-.2 F<415252414e5459>
+2062>-.2 F .579<757420574954484f555420414e592057>-.2 F<415252414e5459>
--1.2 E 3.08<3b77>-.92 G<6974686f7574>-3.08 E -2.15 -.25<65762065>108 648
+-1.2 E 3.079<3b77>-.92 G<6974686f7574>-3.079 E -2.15 -.25<65762065>108
-T 2.73<6e74>.25 G .23<686520696d706c6965642077>-2.73 F .229
+660 T 2.729<6e74>.25 G .229<686520696d706c6965642077>-2.729 F .229
 <617272616e7479206f66204d45524348414e54>-.1 F .229
 <4142494c495459206f72204649544e45535320464f5220412050>-.93 F<4152>-.92 E
-.229<544943554c415220505552504f53452e>-.6 F<536565>5.229 E<74686520474e
+.23<544943554c415220505552504f53452e>-.6 F<536565>5.23 E<74686520474e55
-552047656e6572616c205075626c6963204c6963656e736520666f72206d6f7265206465
+2047656e6572616c205075626c6963204c6963656e736520666f72206d6f726520646574
-7461696c732e>108 660 Q -1.1<596f>108 676.8 S 2.77<7573>1.1 G .27
+61696c732e>108 672 Q -1.1<596f>108 688.8 S 2.77<7573>1.1 G .27
 <686f756c64206861>-2.77 F .57 -.15<76652072>-.2 H<65636569>.15 E -.15
 <7665>-.25 G 2.77<646163>.15 G<6f70>-2.77 E 2.77<796f>-.1 G 2.77<6674>
 -2.77 G .27<686520474e552047656e6572616c205075626c6963204c6963656e736520
 616c6f6e67207769746820746869732070726f6772616d3b206966206e6f742c20777269
-7465>-2.77 F<746f20746865204672656520536f667477>108 688.8 Q<6172652046>
+7465>-2.77 F<746f20746865204672656520536f667477>108 700.8 Q<6172652046>
 -.1 E<6f756e646174696f6e2c20496e632e2c2035392054>-.15 E
 <656d706c6520506c6163652c205375697465203333302c20426f73746f6e2c204d41>
--.7 E<30323131312d3133303720555341>5 E<696d61706c6962>108 705.6 Q<2e70>
+-.7 E<30323131312d3133303720555341>5 E<696d61706c6962>108 717.6 Q<2e70>
--.4 E 2.692<7963>-.1 G .192
+-.4 E 2.691<7963>-.1 G .192
-<6f6d65732066726f6d2074686520507974686f6e206465>-2.692 F 2.692<7674>-.25
+<6f6d65732066726f6d2074686520507974686f6e206465>-2.691 F 2.692<7674>-.25
 G .192<72656520616e64206973206c6963656e73656420756e64657220746865204750
 4c2d636f6d70617469626c6520505346206c6963656e736520617320737461746564>
--2.692 F<696e20746865208c6c65>108 717.6 Q F3<434f50595249474854>2.5 E F0
+-2.692 F<696e20746865208c6c65>108 729.6 Q F3<434f50595249474854>2.5 E F0
 <696e20746865>2.5 E F2<4f668d696e65494d4150>2.5 E F0<64697374726962>2.5
 E<7574696f6e2e>-.2 E<4a6f686e20476f65727a656e>72 768 Q
-<3034204d617263682032303033>148.19 E<39>198.45 E 0 Cg EP
+<30352046656272756172792032303033>143.19 E<39>193.45 E 0 Cg EP
 %%Page: 10 10
 %%BeginPageSetup
 BP
@@ -1509,15 +1512,15 @@ BP
 /F0 10/Times-Roman@0 SF 110.665<4f46464c494e45494d4150283129204f66>72 48
 R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
 113.165 E/F1 10.95/Times-Bold@0 SF -.548<4155>72 84 S<54484f52>.548 E/F2
-10/Times-Bold@0 SF<4f668d696e65494d4150>108 96 Q F0 2.922<2c69>C .422<74
+10/Times-Bold@0 SF<4f668d696e65494d4150>108 96 Q F0 2.923<2c69>C .422<74
 73206c69627261726965732c20646f63756d656e746174696f6e2c20616e6420616c6c20
-696e636c75646564208c6c65732c2065>-2.922 F .422
+696e636c75646564208c6c65732c2065>-2.923 F .422
-<7863657074207768657265206e6f7465642c2077>-.15 F .423
+<7863657074207768657265206e6f7465642c2077>-.15 F .422
 <6173207772697474656e206279204a6f686e>-.1 F
 <476f65727a656e203c6a676f65727a656e40636f6d706c6574652e6f72>108 108 Q
 <673e20616e6420636f70>-.18 E<7972696768742069732068656c6420617320737461
 74656420696e2074686520434f505952494748542073656374696f6e2e>-.1 E F2
-<4f668d696e65494d4150>108 124.8 Q F0 3.804<6d617920626520646f>6.304 F
+<4f668d696e65494d4150>108 124.8 Q F0 3.803<6d617920626520646f>6.303 F
 3.803<776e6c6f616465642c20616e6420696e666f726d6174696f6e20666f756e642c20
 66726f6d2069747320686f6d6570616765207669612065697468657220476f70686572>
 -.25 F<3c55524c3a676f706865723a2f2f717575782e6f72>108 136.8 Q
@@ -1525,21 +1528,21 @@ R<8d696e65494d4150204d616e75616c>-.25 E<4f46464c494e45494d4150283129>
 206f722048545450203c55524c3a687474703a2f2f717575782e6f72>-.25 E
 <672f6465>-.18 E -.15<7665>-.25 G<6c2f6f66>.15 E<8d696e65696d61703e2e>
 -.25 E F2<4f668d696e65494d4150>108 153.6 Q F0 2.276
-<6d617920616c736f20626520646f>4.775 F 2.276
+<6d617920616c736f20626520646f>4.776 F 2.276
 <776e6c6f61646564207573696e6720537562>-.25 F -.15<7665>-.15 G 4.776
 <7273696f6e2e204164646974696f6e616c6c79>.15 F 4.776<2c74>-.65 G 2.276
-<68652064697374726962>-4.776 F 2.276<7574656420746172>-.2 F 2.276
+<68652064697374726962>-4.776 F 2.276<7574656420746172>-.2 F 2.275
-<2e677a206d6179206265>-.55 F .718<75706461746564207769746820612073696d70
+<2e677a206d6179206265>-.55 F .717<75706461746564207769746820612073696d70
 6c65202273766e207570646174652220636f6d6d616e643b206974206973207265616479
-20746f20676f2e>108 165.6 R -.15<466f>5.717 G 3.217<7269>.15 G .717
+20746f20676f2e>108 165.6 R -.15<466f>5.718 G 3.218<7269>.15 G .718
-<6e666f726d6174696f6e206f6e2067657474696e67204f66>-3.217 F
+<6e666f726d6174696f6e206f6e2067657474696e67204f66>-3.218 F
 <8d696e65494d4150>-.25 E<7769746820537562>108 177.6 Q -.15<7665>-.15 G
 <7273696f6e2c20706c656173652076697369742074686520636f6d706c6574652e6f72>
 .15 E 2.5<6753>-.18 G<7562>-2.5 E -.15<7665>-.15 G<7273696f6e2070616765
 203c55524c3a687474703a2f2f73766e2e636f6d706c6574652e6f72>.15 E<672f3e2e>
 -.18 E F1<53454520414c534f>72 194.4 Q F2<6d757474>108 206.4 Q F0
 <2831292c>A F2<707974686f6e>2.5 E F0<283129>A<4a6f686e20476f65727a656e>
-72 768 Q<3034204d617263682032303033>148.19 E<3130>193.45 E 0 Cg EP
+72 768 Q<30352046656272756172792032303033>143.19 E<3130>188.45 E 0 Cg EP
 %%Trailer
 end
 %%EOF

offlineimap/head/manual.txt

@@ -668,7 +668,8 @@ COPYRIGHT
 
        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  the
-       Free Software Foundation; version 2 of the License.
+       Free  Software Foundation; either version 2 of the License, or (at your
+       option) any later version.
 
        This program is distributed in the hope that it  will  be  useful,  but
        WITHOUT  ANY  WARRANTY;  without  even  the  implied  warranty  of MER-
@@ -703,4 +704,4 @@ SEE ALSO
 
 
 
-John Goerzen                     04 March 2003                  OFFLINEIMAP(1)
+John Goerzen                   05 February 2003                 OFFLINEIMAP(1)

offlineimap/head/offlineimap.1

@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "OFFLINEIMAP" "1" "04 March 2003" "John Goerzen" "OfflineIMAP Manual"
+.TH "OFFLINEIMAP" "1" "05 February 2003" "John Goerzen" "OfflineIMAP Manual"
 
 .SH NAME
 OfflineIMAP \- Powerful IMAP/Maildir synchronization and reader support
@@ -772,7 +772,8 @@ OfflineIMAP, and this manual, are Copyright (C) 2002, 2003 John Goerzen.
 .PP
 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
-the Free Software Foundation; version 2 of the License.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 .PP
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap.conf

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap.py

@@ -5,7 +5,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap.sgml

@@ -11,7 +11,7 @@
     <refentryinfo>
       <address><email>jgoerzen@complete.org</email></address>
       <author><firstname>John</firstname><surname>Goerzen</surname></author>
-      <date> $Date: 2003-03-04 14:42:38 -0600 (Tue, 04 Mar 2003) $ </date>
+      <date> $Date: 2003-04-16 09:23:45 -0500 (Wed, 16 Apr 2003) $ </date>
     </refentryinfo>
 
     <refmeta>
@@ -978,7 +978,8 @@ rm -r ~/.offlineimap/AccountName/INBOX</programlisting>
       <para>
 	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
-	the Free Software Foundation; version 2 of the License.
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
       </para>
 
       <para>

offlineimap/head/offlineimap/CustomConfig.py

@@ -3,7 +3,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/accounts.py

@@ -3,7 +3,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/folder/Base.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/folder/IMAP.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/folder/LocalStatus.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/folder/Maildir.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/imapserver.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/imaputil.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/init.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/localeval.py

@@ -5,7 +5,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/mbnames.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/repository/Base.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/repository/IMAP.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/repository/LocalStatus.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/repository/Maildir.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/syncmaster.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/threadutil.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/Blinkenlights.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/Curses.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/Noninteractive.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/TTY.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/Tk.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/UIBase.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/__init__.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/debuglock.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/ui/detector.py

@@ -4,7 +4,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/offlineimap/version.py

@@ -1,8 +1,8 @@
 productname = 'OfflineIMAP'
 versionstr = "3.99.10"
-revno = long('$Rev: 361 $'[6:-2])
+revno = long('$Rev: 367 $'[6:-2])
 revstr = "Rev %d" % revno
-datestr = '$Date: 2003-03-13 10:33:02 -0600 (Thu, 13 Mar 2003) $'
+datestr = '$Date: 2003-04-16 09:23:45 -0500 (Wed, 16 Apr 2003) $'
 
 versionlist = versionstr.split(".")
 major = versionlist[0]
@@ -26,7 +26,8 @@ license = """Copyright (C) 2002, 2003 John Goerzen <jgoerzen@complete.org>
 
 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
-the Free Software Foundation; version 2 of the License.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

offlineimap/head/setup.py

@@ -9,7 +9,8 @@
 #
 #    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
-#    the Free Software Foundation; version 2 of the License.
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of