From e61e994abb9738d98447b203b9908793da6f560a Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Sat, 17 Mar 2012 14:40:38 +0000 Subject: Merge branch 'buildScript' of https://github.com/jokajak/password-manager Conflicts: scripts/builder/repository.py Signed-off-by: Giulio Cesare Solaroli --- (limited to 'frontend/gamma') -- cgit v0.9.0.2