Merge branch '0.2.x' into 0.3.x

Conflicts:
	blkmaker_jansson.c
This commit is contained in:
Luke Dashjr
2014-01-19 04:44:58 +00:00
7 changed files with 4 additions and 374 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 Luke Dashjr
* Copyright 2012-2014 Luke Dashjr
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the standard MIT license. See COPYING for more details.