[open-ils-commits] r10934 - trunk

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-10-28 09:23:37 -0400 (Tue, 28 Oct 2008)
New Revision: 10934

Modified:
   trunk/
   trunk/NEWS
Log:
merging from ILS trunk


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-10-28 09:17:46.167000055 -0400
committer: bzr <bzr at yeti>
properties: 
	branch-nick: trunk

   + timestamp: 2008-10-28 09:23:29.943000078 -0400
committer: bzr <bzr at yeti>
properties: 
	branch-nick: trunk

Name: bzr:ancestry:v3-trunk0
   - dscott at laurentian.ca-20080530155126-5u2nd7xr0bt9029m

   + dscott at laurentian.ca-20080530155126-5u2nd7xr0bt9029m
svn-v3-trunk0:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:10932

Name: bzr:file-ids
   - README	10486 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:README

   + NEWS	10466 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:NEWS

Name: bzr:revision-id:v3-trunk0
   - 8490 dscott at laurentian.ca-20080526181745-56agjebce7qcrvs4
8501 dscott at laurentian.ca-20080530155521-vmwijtzzkx057jbb
8433 dscott at laurentian.ca-20080729140117-b4wi67zdnk5hc9yj
9220 bzr at yeti-20081028131746-n5tiut4cw2nkfgm2

   + 8490 dscott at laurentian.ca-20080526181745-56agjebce7qcrvs4
8501 dscott at laurentian.ca-20080530155521-vmwijtzzkx057jbb
8433 dscott at laurentian.ca-20080729140117-b4wi67zdnk5hc9yj
9220 bzr at yeti-20081028131746-n5tiut4cw2nkfgm2
9221 bzr at yeti-20081028132329-eas87hf6yzvyfe70

Name: bzr:text-parents
   - 
   + NEWS	svn-v3-trunk0:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:10932

Name: svn:mergeinfo
   + /trunk:10932

Name: svk:merge
   + dcc99617-32d9-48b4-a31d-7c20da2025e4:/trunk:10932


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-10-28 13:23:36 UTC (rev 10933)
+++ trunk/NEWS	2008-10-28 13:23:37 UTC (rev 10934)
@@ -1 +1 @@
-#NEWS
+#NEWS