From 80c7d20f83d15890a31b5e0a584dfcb24fb3f2a6 Mon Sep 17 00:00:00 2001
From: JCTutorius <charlie@tutorius-dev.(none)>
Date: Thu, 05 Nov 2009 18:42:53 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainline

Conflicts:
	tests/vaulttests.py
	tutorius/vault.py
---
(limited to 'tutorius/gtkutils.py')

--
cgit v0.9.1