From 6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 Mon Sep 17 00:00:00 2001
From: Clipperz <info@clipperz.com>
Date: Wed, 09 Jan 2013 11:24:13 +0000
Subject: Merge branch 'master' of github.com:clipperz/password-manager

Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css
---
(limited to 'scripts/dev-proxy')

--
cgit v0.9.0.2