commit | 835aaa88419c6747ffb685bc0c3847630de8ce46 | [log] [tgz] |
---|---|---|
author | Sebastian Dröge <sebastian@centricular.com> | Fri Sep 25 22:51:21 2015 +0200 |
committer | Sebastian Dröge <sebastian@centricular.com> | Fri Sep 25 22:51:21 2015 +0200 |
tree | 2c617e491afa28362409d11b478212ef6e843946 | |
parent | c525c18025b8c06012800ea2059384c76885a215 [diff] | |
parent | a9821be106fcf70554e05a11b22d8af5bf17395d [diff] |
Merge branch 'upstream'