Viewing all changes in revision 5050.75.1.
- Committer: Vincent Ladeuil
- Date: 2011-05-17 09:57:58 UTC
- mfrom: (4797.85.4 2.1)
- mto: (5050.73.3 2.2)
- mto: This revision was merged to the branch mainline in revision 5885.
- Revision ID: v.ladeuil+lp@free.fr-20110517095758-fzmm2qmd7rjr2zm8
Merge 2.1 into 2.2 resolving conflicts
- files modified:
- NEWS
expand all
collapse all
added
removed
