Code

Merge branch 'upstream-1.3' into experimental
authorSebastian Harl <sh@tokkee.org>
Thu, 12 Jun 2008 21:19:40 +0000 (23:19 +0200)
committerSebastian Harl <sh@tokkee.org>
Thu, 12 Jun 2008 21:19:40 +0000 (23:19 +0200)
commit07320f320eac039c03ca18bfb5eeea5803701dfe
tree25684db18750df7ce5962ffffc14f18215cd1c66
parentc4a5ffa86d00077f41369bc81304dfbe71d910cf
parent3a03e55068747637db4480d4f3a8ab8ef26c50b1
Merge branch 'upstream-1.3' into experimental