| commit | 792786c7400a136282c1664665ae0a8db921c6c2 | [log] [tgz] |
|---|---|---|
| author | Patrick Mezard <patrick@mezard.eu> | Sun Jan 10 10:55:54 2016 |
| committer | Patrick Mezard <patrick@mezard.eu> | Sun Jan 10 10:55:54 2016 |
| tree | 88a8f04b9498fa242292814d2eed8e86083c98f9 | |
| parent | e8554b8641db39598be7f6342874b958f12ae1d4 [diff] | |
| parent | 4d60064e8c5ac716dd73fad04e5e72cb5ce0d2c5 [diff] |
Merge branch 'shazow-master'