Merge new origin commits.
commit11670625961c5507eb7ca59b1006a33d2356b4fa
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 24 Jan 2015 20:15:30 +0000 (24 12:15 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 24 Jan 2015 20:15:30 +0000 (24 12:15 -0800)
tree481a3e3a3fdc26b7f6e40c5d97db368e9122aa57
parent3b34ad6b4d78ca4bb47af5deb6991675b5b508db
parent85e1e7369f14535c441e8b364faf7f9688292029
Merge new origin commits.