7 Commits

Author	SHA1	Message	Date
Raoul Snyman	cd733f2901	Fix up a linting issue and removed and unused import in lp-merge.py	2017-03-22 22:12:37 -07:00
Raoul Snyman	c256477919	Formalise the merge script	2017-03-11 22:48:23 -07:00
Tim Bentley	74ca42e220	Yet another year goes by	2016-12-31 11:01:36 +00:00
Tim Bentley	3a8b068af8	Year older	2015-12-31 22:46:06 +00:00
Samuel Mehrbrodt	e6978033e9	PEP8	2015-12-17 22:43:49 +01:00
Tomas Groth	755f6c5e7c	remove unneeded quotes from commit message	2015-10-12 13:59:53 +01:00
Tomas Groth	04d2bea5b2	Add merge helper script	2015-10-10 21:53:36 +01:00