Added support for the concatenation ('##') operator. Complicated stuff!
Authored by: plombo 2011-02-14
Parent: [r3009]
Child: [r3011]
