www: 5b0e1ab9: merge of 'a39102233886beb2a2abeaf91e6f3f...

[rlaager at pidgin.im]

----------------------------------------------------------------------
Revision: 5b0e1ab9d1f558bb1b860af16100f5cbf4a79a77
Parent:   a39102233886beb2a2abeaf91e6f3f80e2198ac8
Parent:   ab00be69964164b68eecd57f953be840215145f4
Author:   rlaager at pidgin.im
Date:     07/02/10 00:14:55
Branch:   im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/5b0e1ab9d1f558bb1b860af16100f5cbf4a79a77

Changelog: 

merge of 'a39102233886beb2a2abeaf91e6f3f80e2198ac8'
     and 'ab00be69964164b68eecd57f953be840215145f4'

Changes against parent a39102233886beb2a2abeaf91e6f3f80e2198ac8

  patched  htdocs/download/ubuntu/index.php

Changes against parent ab00be69964164b68eecd57f953be840215145f4

  patched  htdocs/ChangeLog
  patched  htdocs/about/index.php
  patched  htdocs/download/windows/index.php
  patched  inc/version.inc