From 0c74629e8f5c12a9b5a282b817f884fa10dee491 Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Fri, 06 Feb 2004 12:14:56 +0000
Subject: Merge from the 1.0.x release

---
(limited to 'pics/parashoot')

--
cgit v0.9.0.2