diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-01-16 09:03:28 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-01-16 09:03:28 +0100 |
| commit | b5be743912a828d44439693a7c5da2d8fafba7ca (patch) | |
| tree | 41bc3073be301951090e49311b9d9a75ce747d49 /NEWS | |
| parent | e08ec076dbf22f4f4bcdaf4ec11ccb4debc2c713 (diff) | |
| parent | c3716f8a8add2a6fbebef81b05281d777c8369ba (diff) | |
| download | telepathy-account-widgets-b5be743912a828d44439693a7c5da2d8fafba7ca.tar.gz | |
Merge branch 'gnome-3-6'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions