From 17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb Mon Sep 17 00:00:00 2001
From: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Date: Wed, 08 Feb 2012 23:08:46 +0000
Subject: Merge branch 'master' of github.com:gcsolaroli/password-manager into php+gamma

---
(limited to 'frontend/gamma/js/Clipperz/PM/Proxy.js')

--
cgit v0.9.0.2