love conflicts
authorJakub Steiner <jimmac@gmail.com>
Tue, 20 Oct 2009 18:51:04 +0000 (20:51 +0200)
committerJakub Steiner <jimmac@gmail.com>
Tue, 20 Oct 2009 18:51:04 +0000 (20:51 +0200)
commit734136c76a857a395f14ddb2385cc393ab718f87
treee270dfa3a79aa699e2cfe826e6f8ee612c77c706
parentbf3bf9143f5a4742dc14e98fb4799e986efb955c
parentfa392882811005e8e951004387d9792131e0409c
love conflicts
metatheme/metatheme-sonar/gtk-2.0/gtkrc