Viewing all changes in revision 6337.1.1.
- Committer: Vincent Ladeuil
- Date: 2011-12-02 12:28:29 UTC
- mfrom: (6282.4.5 status-shelve-message)
- mto: This revision was merged to the branch mainline in revision 6339.
- Revision ID: v.ladeuil+lp@free.fr-20111202122829-qfj1bcb435vatrrn
Merge trunk resolving conflicts
expand all
collapse all
added
removed
