]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 6 May 2012 08:51:15 +0000 (04:51 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 6 May 2012 08:51:15 +0000 (04:51 -0400)
commit7e7372fc5af41bb1af125e4d4e92cb7701e56faa
tree9b3f2ae85a81c7983f6595679a370fc5a6815f1e
parent0c4099966a5ac1f1ff5dc568a600aa57776fb752
parent47c3b43afd64cd1c05b67d347fb1219c42fe6d20
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bad sql left after the mailbox in/out merge

* master: