www: b7169c6d: merge of '7795190ee485906c5bd87ea3cdca75...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: b7169c6d335c26077486737f3bd513f8d698ee77
Ancestor: 7795190ee485906c5bd87ea3cdca75695c8667d1
Ancestor: df0e364b49f7c3d569c7b76120cc75feb2d91b7d
Author: markdoliner at pidgin.im
Date: 2009-09-03T18:33:25
Branch: im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/b7169c6d335c26077486737f3bd513f8d698ee77

Added files:
        htdocs/security/index.php
Added directories:
        htdocs/security
Modified files:
        htdocs/news/security/index.php

ChangeLog: 

merge of '7795190ee485906c5bd87ea3cdca75695c8667d1'
     and 'df0e364b49f7c3d569c7b76120cc75feb2d91b7d'