| commit | b874d24629aa132d74a96134ec8eae4773a3c0ce | [log] [tgz] |
|---|---|---|
| author | Theodore Ts'o <tytso@mit.edu> | Fri Aug 29 11:38:33 2014 -0400 |
| committer | Theodore Ts'o <tytso@mit.edu> | Fri Aug 29 11:38:33 2014 -0400 |
| tree | a79927bcf2f325220253c341f6d3845e95b617fe | |
| parent | bf93a9685ea71db0a519e1df07c3ed850933034d [diff] | |
| parent | 6a3741ad293031447b95b88431eafa77401a8987 [diff] |
Merge tag 'v1.42.12' into next v1.42.12 Conflicts: version.h