Clipperz 6cfcbb8dee Merge branch 'master' of github.com:clipperz/password-manager ...

Conflicts:
	frontend/beta/css/yui-extensions/basic-dialog.css

2013-01-09 12:24:13 +01:00

..

beta

Merge branch 'master' of github.com:clipperz/password-manager

2013-01-09 12:24:13 +01:00

gamma

Fixed application version display on /gamma

2013-01-09 12:05:50 +01:00