4 commits

Author	SHA1	Message	Date
kaetemi	a4f8ae738a	Merge with hotfix	2015-03-07 00:01:02 +01:00
kaetemi	503eb6ea5e	Merge with hotfix	2015-03-06 23:40:48 +01:00
kaetemi	168a0eaa67	EOL	2015-03-06 23:39:53 +01:00
Nimetu	81273e4c4a	Fix compilation	2015-03-01 18:41:16 +02:00