commit 04ba4cc32a7d39008c56640524ecb99cfce0b477 Merge: 0c8aea6 93b9651 Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Sep 27 08:13:50 2012 -0400

Merge remote-tracking branch 'gsathya/bug_6953'

pyonionoo/database.py | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-)