Merge branch 'presets-dialog'
authorDavyd Madeley <davyd@madeley.id.au>
Thu, 23 Apr 2009 12:01:37 +0000 (20:01 +0800)
committerDavyd Madeley <davyd@madeley.id.au>
Thu, 23 Apr 2009 12:01:37 +0000 (20:01 +0800)
commitb4861a62cb323d686973e7527f02bd738053c04c
treeba76fb927534d73d427027c87b3b6c1b51226e32
parent338d2877c0f52c69cf362ab9349d07681dafa89d
parent2315303fa0d4cf3532a9a1e63e7bb118b386c48c
Merge branch 'presets-dialog'
libempathy-gtk/empathy-presence-chooser.c
tests/Makefile.am