| commit | 7f825226e3e19998a0ef6184b9ac6e4e57aebc6f | [log] [tgz] |
|---|---|---|
| author | doko@ubuntu.com <doko@ubuntu.com> | Mon Apr 13 21:48:44 2015 +0200 |
| committer | doko@ubuntu.com <doko@ubuntu.com> | Mon Apr 13 21:48:44 2015 +0200 |
| tree | addd7a4c627f6563c1d2c146e53e87a614f3b765 | |
| parent | 97aa953550c743fa360a67dd6a6dbda15fd81405 [diff] | |
| parent | 3536350d84a05baa2f7f6e1c85f63756ab57fc82 [diff] |
- merge heads