Merge branch 'devel' of git://uglyman.kremlin.cc/git/systembsd into devel
authorkremlin <ian@kremlin.cc>
Mon, 25 Aug 2014 19:57:22 +0000 (14:57 -0500)
committerkremlin <ian@kremlin.cc>
Mon, 25 Aug 2014 19:57:22 +0000 (14:57 -0500)
commit0ac4fd1d17dce32e2ee028f563ff48ff16e24275
tree696736ae83f665a121303bfff16edfcabcfee6ab
parent1066bd3646e52f012fe2145eb92070f25ee6332e
parentd8c6b73c9dbb7485e2acd6a7b46bfb1f424366e3
Merge branch 'devel' of git://uglyman.kremlin.cc/git/systembsd into devel