[molly-commits] mollyproject branch, website_redesign, updated. presplit-215-gfacfc5a

[Tim F. <tim...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "mollyproject".

The branch, website_redesign has been updated
       via  facfc5a029af842dfbb1d4d96c6fe8bbd4b0e5b6 (commit)
       via  b26e444b3701762ed10bb75e4483a487284f83b2 (commit)
      from  03de71f10b747f2f881fff7cb96da8a1bc3f6a68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit facfc5a029af842dfbb1d4d96c6fe8bbd4b0e5b6
Merge: b26e444b3701762ed10bb75e4483a487284f83b2 03de71f10b747f2f881fff7cb96da8a1bc3f6a68
Author: Tim Fernando <tim...@ou...>
Date:   Fri Jun 25 16:14:18 2010 +0100

    Merge branch 'website_redesign' of ssh://mollyproject.git.sourceforge.net/gitroot/mollyproject/mollyproject into website_redesign
    
    Conflicts:
    	mollyproject.org/community.html

commit b26e444b3701762ed10bb75e4483a487284f83b2
Author: Tim Fernando <tim...@ou...>
Date:   Fri Jun 25 16:12:10 2010 +0100

    Added Oxford University, Oxford Brookes University logos and modified community page to suit.

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

Summary of changes:
 mollyproject.org/community.html                    |   20 +++++++++++++++++---
 .../screenshots/oxfordBrookesuniversity-logo.jpg   |  Bin 0 -> 11637 bytes
 .../screenshots/universityofOxford-logo.gif        |  Bin 0 -> 3680 bytes
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 mollyproject.org/screenshots/oxfordBrookesuniversity-logo.jpg
 create mode 100644 mollyproject.org/screenshots/universityofOxford-logo.gif


hooks/post-receive
-- 
mollyproject