Merge branch 'release/0.2.12' into develop
authorJan Dittberner <jan@dittberner.info>
Sat, 5 Jan 2013 13:27:23 +0000 (14:27 +0100)
committerJan Dittberner <jan@dittberner.info>
Sat, 5 Jan 2013 13:27:23 +0000 (14:27 +0100)
commitbc04b4d9be0a12a8c2cad2e6ef11668bee698fd0
tree5d808ab1119c21e9606313e97cc3be5c7e583161
parentb0be4b6a690af5848a62f9d8e9ad9c6de62a0b8a
parentab731ddbd279c1dc154c2ff90435b1e4a68ba3fd
Merge branch 'release/0.2.12' into develop