| commit | 95534a3e58c1002ee81c427cccd227eac08944b8 | [log] [tgz] |
|---|---|---|
| author | Sebastian Dröge <sebastian@centricular.com> | Fri Sep 25 23:00:45 2015 +0200 |
| committer | Sebastian Dröge <sebastian@centricular.com> | Fri Sep 25 23:00:45 2015 +0200 |
| tree | 9de891c1cb2d4b395c0598a93a36ef250bff9c8b | |
| parent | 0c264e667a76f5f9973306d549ac3a3f8bb03748 [diff] | |
| parent | 38a7cc1cfcff6e073cefb2a06ec797daebcac979 [diff] |
Merge branch 'upstream'