commit 4453121d96efa3f126930bcbd51214e3b477b623 Merge: 473ff41 ae4c915 Author: Dominik Mierzejewski <dominik at greysector.net> Date: Mon Nov 15 20:43:41 2010 +0100 Merge remote branch 'origin/f12/master' Conflicts: libgadu.spec ---