Merge branch '1.2'

Conflicts:
	configure.ac
This commit is contained in:
Petri Lehtinen
2010-03-28 21:44:41 +03:00
26 changed files with 147 additions and 23 deletions

1
.gitignore vendored
View File

@@ -24,3 +24,4 @@ missing
stamp-h1
*.pyc
*.pc
/src/jansson.h