]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 4 Mar 2012 09:58:12 +0000 (04:58 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 4 Mar 2012 09:58:12 +0000 (04:58 -0500)
commita6d08ec8523ea45d6958882d4864232de0902b3b
tree3044391ee71fc72a75e1b4d918e6616c255c75a5
parenteae6418074d8c2addf85acf11e8f83165b847d04
parentdfa056bb1beedf4e48c470ff14bfa7d412ebcb26
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  some fixes in diabook

* master: