Merge tag 'v3.3.4' into 3.3/master
commit47ffce042f99c1fda7423f897720c3bf3143fc00
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Fri, 27 Apr 2012 20:52:09 +0000 (27 22:52 +0200)
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Fri, 27 Apr 2012 20:52:09 +0000 (27 22:52 +0200)
tree69c96714ec5a1241866d1ea7e099b95f83940206
parent7d6001fd6a3be955aaa72c4e019b8651b7608fa6
parentd0c4f31c99b390c9bfc54e79de0f7650ab819352
Merge tag 'v3.3.4' into 3.3/master

This is the 3.3.4 stable release
# gpg: Signature made Fri 27 Apr 2012 07:17:43 PM CEST using RSA key ID 6092693E
# gpg: Can't check signature: No public key

Conflicts:
Makefile
Makefile
fs/splice.c