Merge branch 'master' into client-server
authorJens Axboe <axboe@kernel.dk>
Wed, 12 Oct 2011 07:47:25 +0000 (09:47 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 12 Oct 2011 07:47:25 +0000 (09:47 +0200)
commitfddc6604f91ebf76d9090741f9d4f5a4d33be0c6
treed8e2498b878c7d96f6949e1ed7b4069923bb4f01
parentb814fb2694fe178b5cb94e046b9d31944e752f4a
parent15b87723551b424d0db4c53577b567e670c7d4d8
Merge branch 'master' into client-server

Conflicts:
init.c
io_u.c
os/windows/install.wxs
os/windows/version.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_u.c