70 commits

Author	SHA1	Message	Date
kervala	628c2b1d80	Merge with develop	2016-01-16 10:52:18 +01:00
kervala	130847cac5	Merge with develop	2016-01-14 21:28:47 +01:00
kervala	6a5fc56ce0	Merge with develop	2016-01-13 20:05:06 +01:00
kervala	8d905df095	Merge with develop	2016-01-12 22:32:22 +01:00
kervala	989569c137	Merge with develop	2016-01-07 17:41:02 +01:00
kervala	88226323e0	Merge with develop	2016-01-06 13:22:47 +01:00
Nimetu	378b520048	Merge with develop	2016-01-06 01:02:22 +02:00
kervala	b02956196d	Merge with develop	2016-01-04 19:27:21 +01:00
kervala	7de5594966	Merge with develop	2016-01-04 15:41:29 +01:00
kervala	a6694d122b	Merge with develop	2016-01-04 14:03:11 +01:00
kervala	7879ca7566	Merge with develop	2016-01-02 20:29:55 +01:00
kervala	83f8502b51	Merge with develop	2016-01-01 16:27:45 +01:00
kervala	de1519f50b	Merge with develop	2015-12-28 16:44:35 +01:00
kervala	f66c15c5da	Merge with develop	2015-12-26 14:38:37 +01:00
kervala	8dda998ea5	Merged with develop	2015-12-25 20:52:18 +01:00
kervala	0a03d1c870	Merge with develop	2015-12-25 15:37:07 +01:00
kervala	d2676c3b57	Merge with develop	2015-12-23 15:31:37 +01:00
Nimetu	2c94ec2e2d	Merge with develop	2015-12-19 20:40:05 +02:00
Nimetu	588d1ca8ce	Merge with develop	2015-12-18 14:34:48 +02:00
Nimetu	bf33ad683f	Merge with develop	2015-12-13 21:04:37 +02:00