]> git.0d.be Git - empathy.git/commit
Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'
authorJonny Lamb <jonnylamb@gnome.org>
Wed, 18 May 2011 14:23:15 +0000 (15:23 +0100)
committerJonny Lamb <jonnylamb@gnome.org>
Wed, 18 May 2011 14:23:15 +0000 (15:23 +0100)
commit93a7de11fb8ec365c6a7f1818b1260e689e0428e
tree17473607401b83dc7a4b3114292383dc1a90166c
parent4a5169bf01a7a67bfa08b2d596c6d4f5e92a73b6
parentc51c43f90643a4a5080ec1412229f0eb56ca9a34
Merge branch 'LOLOOOLOLOLOLLLOLLLOLOLLL'
src/empathy-chat-window.c