Merge branch 'master' into session_lock
[pazpar2-moved-to-github.git] / .gitmodules
2008-03-15 Adam Dickmeissa