##// END OF EJS Templates
Merging latest trunk....
Merging latest trunk. I got a criss-cross merge in this and did merge --weave. Hope this is OK.

File last commit:

r1420:34bafc01
r1890:c3323314 merge
Show More
simplevars.py
2 lines | 22 B | text/x-python | PythonLexer
x = 1
print 'x is:',x