Merge branch 'master' into php5

* master:
  "@access static" isn't a thing
This commit is contained in:
Andreas Fischer 2014-12-27 20:25:04 +01:00
commit f2134aa4b2

View File

@ -34,7 +34,6 @@ class Stream
* Rather than re-create the connection we re-use instances if possible * Rather than re-create the connection we re-use instances if possible
* *
* @var Array * @var Array
* @access static
*/ */
static $instances; static $instances;