update phpdoc
Merge branch 'pr/35' into incoming
[auto] Merge from Core

    • #2891932 — update phpdoc (agerlier, 2014-06-03)
    • #a497620 — Merge branch 'pr/35' into incoming (Ivan Enderlin, 2014-06-17)

---

Merge branch 'master' of /var/lib/git/repositories/Library/Core