Zixaphir 34dd4ba96a Merge branch 'v3'
Conflicts:
	CHANGELOG.md
2014-03-26 15:32:57 -07:00
..
2014-02-13 18:37:20 +01:00
2014-02-13 18:37:20 +01:00
2013-08-15 23:02:54 -07:00
2014-03-20 15:21:24 -07:00
2014-03-26 15:32:57 -07:00