[auto] Merge from Memory
[auto] Merge from Memory

    • #34bd479 — Define flex entities. (Ivan Enderlin, 2013-10-15)

---

Merge remote branch 'library-memory/master'

vcgato29/Central,Metalaka/Central,vcgato29/Central,Metalaka/Central,Grummfy/Central,Grummfy/Central