Viewing all changes in revision 6378.1.5.
- Committer: Vincent Ladeuil
- Date: 2011-12-19 16:41:49 UTC
- mfrom: (6386 +trunk)
- mto: This revision was merged to the branch mainline in revision 6387.
- Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts
- files modified:
- bzr
expand all
collapse all
added
removed
