The branch, master has been updated via 36d2627151a7d1349d78bae43d0caf0a7c3a97b3 (commit) via 74f593aa867f631d1e80c177bbd61e70a5c2af30 (commit) from 167f72efc986bc3ee5c55a7d18ae9a419180faa0 (commit)

- Log ----------------------------------------------------------------- commit 36d2627151a7d1349d78bae43d0caf0a7c3a97b3 Merge: 167f72efc986bc3ee5c55a7d18ae9a419180faa0 74f593aa867f631d1e80c177bbd61e70a5c2af30 Author: Michal Čihař mcihar@novell.com Date: Tue Oct 26 15:06:44 2010 +0200

Merge branch 'QA_3_3'

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

Summary of changes: themes/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/themes/.gitignore b/themes/.gitignore index 2676970..410d2dc 100644 --- a/themes/.gitignore +++ b/themes/.gitignore @@ -15,6 +15,7 @@ openphpnuke original_small paradice pixeline +pmahomme silk silkline smooth_yellow

hooks/post-receive