Merge branch 'release-integration'
commitf018888ed86133b5cde76e0d24f3222b6f2605d3
authorStephen Lombardo <sjlombardo@zetetic.net>
Wed, 16 May 2012 00:49:14 +0000 (15 20:49 -0400)
committerStephen Lombardo <sjlombardo@zetetic.net>
Wed, 16 May 2012 00:49:14 +0000 (15 20:49 -0400)
tree642f1b2bf79bde1faf86585977501fa92ec48f2d
parentf09f9f908ab88b63bb357f569ab15573bbb3cf6d
parentf26e6abad628031f88a571c0cc33d0075382e368
Merge branch 'release-integration'
src/crypto.c
src/pager.c