Viewing all changes in revision 2706.1.1.
- Committer: John Arbash Meinel
- Date: 2014-05-08 06:58:42 UTC
- mfrom: (2248.26.7 1.18)
- mto: This revision was merged to the branch mainline in revision 2707.
- Revision ID: john@arbash-meinel.com-20140508065842-nubn1vywyvtlmrxg
merge 1.18 r2280 which is only cherrypicks back from trunk, and resolve conflicts
expand all
collapse all
added
removed