Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  deleted readme.txt from folder diabook
  github finally working
  adjust3
  adjust2
  adjust

* master:
This commit is contained in:
Simon L'nu 2012-03-02 12:28:28 -05:00
parent e2e9050d74
commit 02f8e95b1a

Diff content is not available