| commit | f7b967bffefe69f1ad8b79e263237ec1feba7b9b | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:16:11 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:16:11 2012 -0700 |
| tree | 6c9364fb902aa4475688cf2db8efd95f8c507eeb | |
| parent | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 [diff] | |
| parent | d192f93cfca6a0aedbf10fa548d8bc17b86275d6 [diff] |
Merge branch 'next/maintainers' into HEAD