Merge branch 'develop' v1.4
authormeinhard <meinhard@benn.org>
Sat, 9 Feb 2013 11:32:43 +0000 (20:32 +0900)
committermeinhard <meinhard@benn.org>
Sat, 9 Feb 2013 11:32:43 +0000 (20:32 +0900)
commit66f7e61ffe490c5c370c69f390f5957926bf0af7
tree379c64cf77282a70329121e7de0ae9f54b9e54bb
parentb9e66491c91e727ac0c23be6bca1a7ca9694057c
parente3dad9b17b9bd2c462876e86280cfd58b99d6b79
Merge branch 'develop'