From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 20 Apr 2012 09:52:08 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1c88a7ef5ded0a5e58a554482d2c1fbeb78c2ef0;p=friendica.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  XSRF protection and PHPdoc for mod/admin.php
  XSRF protection and PHPdoc for mod/admin.php

* master:
---

1c88a7ef5ded0a5e58a554482d2c1fbeb78c2ef0