www: da9f294d: merge of '6960ada3e70b05bb7f1b95d5101a33...

[markdoliner at pidgin.im]

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

Changelog: 

merge of '6960ada3e70b05bb7f1b95d5101a33bec59d1abd'
     and 'd198e6e3f7ba07b4dedab10d412640d74c94ac23'

Changes against parent 6960ada3e70b05bb7f1b95d5101a33bec59d1abd

  patched  htdocs/news/security/index.php

Changes against parent d198e6e3f7ba07b4dedab10d412640d74c94ac23

  patched  htdocs/index.php
  patched  htdocs/news/security/index.php
  patched  inc/version.inc