Merge remote-tracking branch 'erlehmann/master'
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)
commit02653573d27efa13d8590504a8d30866fe5b093e
tree0894fb522ed13d77e6b104183fb6f3a62b6d9741
parent5c66664aef852c01c8ec8f79856ba081cf01446b
parent21b7a272c4558795f5e8b7d8af859d51dd616d31
Merge remote-tracking branch 'erlehmann/master'

Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
src/CMakeLists.txt