diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-17 17:54:53 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-17 17:54:53 +0100 |
| commit | 92814a55d012c3a6cd5111486f3505ceb6f31984 (patch) | |
| tree | f2f78d14b5384e54a1737077d9ead2c9db654f4a /misc | |
| parent | 979e89eeb362e467068d9f1ce3b7f9669ae7da7c (diff) | |
| parent | 254a277868df1adb1b1db62f43a3c19944f3bf80 (diff) | |
Merge branch 'telepathy-haze-0.8'
Conflicts:
NEWS
Diffstat (limited to 'misc')
0 files changed, 0 insertions, 0 deletions