[Koha-cvs] CVS: koha ChangeLog,1.4.2.2,1.4.2.3

[Andrew Arensburger]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv2899

Modified Files:
      Tag: arensb-context
        ChangeLog 
Log Message:
Merged with head.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/koha/koha/ChangeLog,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** ChangeLog   5 Oct 2002 06:37:12 -0000       1.4.2.2
--- ChangeLog   5 Oct 2002 08:33:02 -0000       1.4.2.3
***************
*** 1,4 ****
--- 1,7 ----
  2002-10-05  Andrew Arensburger  <address@hidden>
  
+       * C4/Output.pm, C4/Context.pm, C4/Biblio.pm: Merged in changes
+       from main branch.
+       
        * marc/viewmarc.pl: Added a FIXME comment.