The branch, master has been updated via b924bc7c112f5ed6f80da7f195687ce632feacf9 (commit) via 2ba852dc5ca3dc9d2697ee29bd11ad61ab987553 (commit) via bc0b9fa744bd1b1a7ff460f728248e581ee106f0 (commit) via b1103e2db99405d032a230ed50f0b88b799605a3 (commit) via f805097b86fabd3d4c8dff1f2324efdae1ca0d70 (commit) from c8711412367d492e94d6c2de1ff3b6b716198005 (commit)

- Log ----------------------------------------------------------------- commit b924bc7c112f5ed6f80da7f195687ce632feacf9 Merge: c8711412367d492e94d6c2de1ff3b6b716198005 2ba852dc5ca3dc9d2697ee29bd11ad61ab987553 Author: Michal Čihař mcihar@novell.com Date: Thu Dec 9 14:19:35 2010 +0100

Merge branch 'QA_3_3'

Conflicts: pdf_pages.php

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

Summary of changes:

hooks/post-receive