The branch, master has been updated via 829e482ed14193848b181bb06f35cc77c0597b31 (commit) via 848989bdb6da22d99b5a5b04ad83964db973df43 (commit) via 7393468b126dbf20e1e4ef4cdf9d3dd330332de2 (commit) via 4b3d5c768bc0c1db2d5f1c986027dc2ec0ca3f63 (commit) from 1947baa1ac9ca7fb4b7e1fff856dacf15f45796c (commit)

- Log ----------------------------------------------------------------- commit 829e482ed14193848b181bb06f35cc77c0597b31 Merge: 1947baa1ac9ca7fb4b7e1fff856dacf15f45796c 848989bdb6da22d99b5a5b04ad83964db973df43 Author: Michal Čihař michal@cihar.com Date: Mon Nov 1 10:19:35 2010 +0100

Merge branch 'QA_3_3'

Conflicts: lang/slovenian-utf-8.inc.php

-----------------------------------------------------------------------

Summary of changes:

hooks/post-receive