www: 14f31972: merge of '8facd83923b45eb4f77d645efccf9d...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 14f319723296ff18e9e7f4134eb902be4c88104f
Parent:   8facd83923b45eb4f77d645efccf9d5ed5f6ecf9
Parent:   dfafda783d60763f9640916b79db987834c58978
Author:   markdoliner at pidgin.im
Date:     07/21/10 00:20:23
Branch:   im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/14f319723296ff18e9e7f4134eb902be4c88104f

Changelog: 

merge of '8facd83923b45eb4f77d645efccf9d5ed5f6ecf9'
     and 'dfafda783d60763f9640916b79db987834c58978'

Changes against parent 8facd83923b45eb4f77d645efccf9d5ed5f6ecf9

  patched  htdocs/ChangeLog
  patched  htdocs/index.php
  patched  htdocs/win32/ChangeLog.win32
  patched  inc/version.inc

Changes against parent dfafda783d60763f9640916b79db987834c58978

  patched  htdocs/about/index.php
  patched  htdocs/download/ubuntu/index.php
  patched  htdocs/download/windows/index.php
  patched  htdocs/news/blogs/index.php
  patched  inc/version.inc