52 Commits

Author	SHA1	Message	Date
raghunayyar	63645461f0	Fixes Markup in templates.	2014-06-02 12:53:52 +02:00
raghunayyar	9ba4a76214	resolving conflict when picking 8b81a0b	2014-06-02 12:53:52 +02:00