From 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 Mon Sep 17 00:00:00 2001
From: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Date: Sat, 17 Mar 2012 21:28:40 +0000
Subject: Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Conflicts:
	frontend/gamma/properties/gamma.properties.json
---
(limited to 'README.md')

--
cgit v0.9.0.2