Merge branch 'make-jobs'
authorTaylor R Campbell <campbell@mumble.net>
Wed, 29 May 2013 14:25:00 +0000 (14:25 +0000)
committerTaylor R Campbell <campbell@mumble.net>
Wed, 29 May 2013 14:25:00 +0000 (14:25 +0000)
commite699d799c26dbfb8817d0e69ce9b16262687cfde
tree6d7f606c8125c5a6e87d8705bea195607d9971ef
parentd32daae4896d40842608f10d6a1d3700c381760b
parentbaf53dfe9d4b73ab864b589407827d44df02e096
Merge branch 'make-jobs'