merged branch marcw/feat-patch-changelog (PR symfony#3788)

fabpot · fabpot · commit fec3d29ea8f8 · 2012-04-05T08:10:14.000+02:00
Commits ------- f5bc208 Updates CHANGELOG for commit f718859. Discussion ---------- Updates CHANGELOG for commit f718859.
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
@@ -323,6 +323,8 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * Added basic session meta-data to the session to record session create time,
    last updated time, and the lifetime of the session cookie that was provided
    to the client.
+ * Request::getClientIp() method doesn't take a parameter anymore but bases
+   itself on the trustProxy parameter.
 
 ### HttpKernel
 
