www: b7cb4926: merge of '0c0c5d6e71b6e1e43c28992a8f0074...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: b7cb492600fd686cfab51845956883ae6bcf4cde
Parent:   0c0c5d6e71b6e1e43c28992a8f0074c99c2fbf35
Parent:   f3c1ee38e7e8a7e97ec09cbb1993f17da8e4ff40
Author:   markdoliner at pidgin.im
Date:     10/08/10 19:04:58
Branch:   im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/b7cb492600fd686cfab51845956883ae6bcf4cde

Changelog: 

merge of '0c0c5d6e71b6e1e43c28992a8f0074c99c2fbf35'
     and 'f3c1ee38e7e8a7e97ec09cbb1993f17da8e4ff40'

Changes against parent 0c0c5d6e71b6e1e43c28992a8f0074c99c2fbf35

no changes

Changes against parent f3c1ee38e7e8a7e97ec09cbb1993f17da8e4ff40

  patched  htdocs/download/source/index.php