From 94a9d56d8a6339033b5ccf859e76ca060ad7378f Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajay@activitycentral.com>
Date: Thu, 29 Nov 2012 17:51:02 +0000
Subject: Merge tag 'v0.98' into 0.97.6-as-base

Conflicts:
	configure.ac
---
--
cgit v0.9.1