Viewing all changes in revision 6436.1.4.
- Committer: Jelmer Vernooij
- Date: 2012-01-17 10:30:33 UTC
- mfrom: (6437.3.3 2.5)
- mto: (6437.3.4 2.5)
- mto: This revision was merged to the branch mainline in revision 6441.
- Revision ID: jelmer@samba.org-20120117103033-ip04n3frhhlv19x7
Merge 2.5.
expand all
collapse all
added
removed
