Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 13:49:07 +0000 (15:49 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 13:49:07 +0000 (15:49 +0200)
commita6e006783bb9f4e3651d0a006345c5351cc70a6d
treedc38620d07fd719508f157a3a4b7d784e088ea92
parent4257e874fd67f48343f94e36840bc16d3002122a
parent98e5260e62fe97ab215f6d428befd38a46e51d0b
Merge branch 'master' into backbone

Conflicts:
debian/files
trunk/src/base/backbone/backbone.cpp