www: 6960ada3: merge of '687369ad7b57d5eb6277043b936eba...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 6960ada3e70b05bb7f1b95d5101a33bec59d1abd
Parent:   687369ad7b57d5eb6277043b936ebae30da763b1
Parent:   d3c797345ca2372751e034e49fd278d7343d3799
Author:   markdoliner at pidgin.im
Date:     08/07/11 02:49:49
Branch:   im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/6960ada3e70b05bb7f1b95d5101a33bec59d1abd

Changelog: 

merge of '687369ad7b57d5eb6277043b936ebae30da763b1'
     and 'd3c797345ca2372751e034e49fd278d7343d3799'

Changes against parent 687369ad7b57d5eb6277043b936ebae30da763b1

  patched  htdocs/news/security/index.php

Changes against parent d3c797345ca2372751e034e49fd278d7343d3799

  patched  inc/version.inc