Merge tag 'upstream/2_rc2+svn376' into experimental
authorDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 22 Mar 2012 19:44:53 +0000 (21:44 +0200)
committerDimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Thu, 22 Mar 2012 19:44:53 +0000 (21:44 +0200)
commitaffb017a7a7c74d3b3bffb7e48300aa8694ab18a
treef1ce460dbed775b8fc6903ee869ca6bf88b3f32a
parentc5195312e921bf68dc6263c40dd01e6a94f6ea30
parentf77239d8178c16a47170512a9db28c0499f9e349
Merge tag 'upstream/2_rc2+svn376' into experimental

Upstream version 2~rc2+svn376

Conflicts:
texinfo/CMakeLists.txt
CMakeLists.txt