From f1b7ba04fa57630d8882d7cbecc057c5f1fa2e2f Mon Sep 17 00:00:00 2001
From: Tobias Steinle <steinle@icp.uni-stuttgart.de>
Date: Fri, 1 Jun 2012 15:22:21 +0200
Subject: [PATCH] Merge branches 'angle-potentials' and 'angletest' into
 angle-potentials