From 7b5cee65fd9cf31e4f19ce4ff613778cb95512a9 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Fri, 14 Nov 2008 08:30:28 +0000
Subject: Merge branch 'stable'

---
(limited to 'parsing.c')

--
cgit v0.9.0.2