Skip to content

Commit

Permalink
Merge branch 'v0.12.0.x' into v0.12.1.x
Browse files Browse the repository at this point in the history 
Conflicts:
	configure.ac
	src/clientversion.h
  • Loading branch information
@schinzelh
schinzelh committed Sep 28, 2015
2 parents ac3a012 + 27a4f5e commit 7c288e1
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 7c288e1

Please sign in to comment.