am ffae6f51: (-s ours) am 25a331ab: Merge "Update version string." into eclair

Merge commit 'ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0'

* commit 'ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0':
  Update version string.