]> git.mxchange.org Git - friendica.git/commit
Merge pull request #131 from simonlnu/master
authorSimon <simon@kisikew.org>
Wed, 14 Mar 2012 05:10:02 +0000 (22:10 -0700)
committerSimon <simon@kisikew.org>
Wed, 14 Mar 2012 05:10:02 +0000 (22:10 -0700)
commitfb77bfa648c3dd06d1b3f343f5ad98f32a7ce313
treebc2ba3aac0a08c1464718f688be8080d0dff6d2c
parent4972d7ef6ee740f6eb09d8c7efa9a76ee40973c1
parent975781d3e23e6beb2ac86b191c7c12b7347c1705
Merge pull request #131 from simonlnu/master

massive work done to both dispys, mostly -dark