Merge branch 'master'
authorChristos KK Loverdos <loverdos@gmail.com>
Thu, 20 Sep 2012 13:20:46 +0000 (16:20 +0300)
committerChristos KK Loverdos <loverdos@gmail.com>
Thu, 20 Sep 2012 13:20:46 +0000 (16:20 +0300)

Trivial merge