diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-05 00:09:03 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-05 00:09:03 +0200 |
| commit | 2b383d19e716863134087fe83d0aa5ba156006bd (patch) | |
| tree | 3486cd56b4c318d3f73f2f9a01b73c8f9c940b7c | |
| parent | 0c60fae0adf77cd5b95cd8aa69aa89a3fe265ab0 (diff) | |
| parent | f916acc91d84f7e5e84c0e8cf15a5ab891222bab (diff) | |
Merge branch 'elementary'
