Filippo Squillace a19d6692a9 Merge branch '31_keyring' into dev ... Conflicts: lib/core.sh		2014-12-02 23:16:14 +01:00
..
core.sh	Merge branch '31_keyring' into dev	2014-12-02 23:16:14 +01:00
util.sh	Add tests for util.sh #12	2014-11-25 21:49:24 +01:00