-
Committer:
Guillermo Gonzalez
-
Date:
2008-09-10 23:12:59 UTC
-
mfrom:
(164.18.30 trunk)
-
mto:
(164.35.3 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
242.
-
Revision ID:
guillo.gonzo@gmail.com-20080910231259-4wnfmu30f4n90w6x
* merge with trunk (resolve conflicts in NEWS and serve-branches)