Merge tag 'v3.3.6' into 3.3/master
commit8fdf0252f406fd041111005f521493fb21f8084c
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Sat, 12 May 2012 18:13:28 +0000 (12 20:13 +0200)
committerJan Alexander Steffens (heftig) <jan.steffens@gmail.com>
Sat, 12 May 2012 18:13:28 +0000 (12 20:13 +0200)
treedc9e86e22b8beb7870e6c4b5d0d96b29ebb2d81d
parentd2a5e1083511a4929fc76c522a9c4467b88e4a21
parentb67be2a5c9ed3f101e1562a9efe160b368000f89
Merge tag 'v3.3.6' into 3.3/master

This is the 3.3.6 stable release

Conflicts:
Makefile
Makefile