Changeset 2796292

Timestamp:
01/08/15 17:00:05 (2 weeks ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.1.1
Children:
66c56b8
Parents:
6e5c1f9 (diff), 49c33fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
5 edited

Note: See TracChangeset for help on using the changeset viewer.