Changeset 8283f06

Timestamp:
05/29/14 13:22:09 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
e929643, 479e9767
Parents:
a2bcff2 (diff), a68d4e6 (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:
2 edited

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