Merge branch 'sitka_2_2'
authorJennifer Pringle <jpringle@sitka.bclibraries.ca>
Mon, 2 Jul 2012 01:43:22 +0000 (18:43 -0700)
committerJennifer Pringle <jpringle@sitka.bclibraries.ca>
Mon, 2 Jul 2012 01:43:22 +0000 (18:43 -0700)
commit39c896b1d519f47e550c1a93b3f911bd4d042977
treead59d681cc1cae87de52254d25341b86d26343e5
parenta3c6c948ec0a5a72723847e5ba89f16ae7270dc9
parent7cf9d92c4eda808cd16574885b35c6996621b1f2
Merge branch 'sitka_2_2'