tree 974e1549c5b1bc4613b4b5cf0de49f642976fba0
parent 15903109c984d7543bb356e39e42bcf36a55083d
parent f2a8088cf1db732b8451aded698502e37eeb5502
author Marcel Kinard <cmarcelk@gmail.com> 1409946091 -0400
committer Marcel Kinard <cmarcelk@gmail.com> 1409946091 -0400

Merge branch 'master' into 3.6.x

Conflicts:
	VERSION