Merge branch 'aspects-add-fix' of https://github.com/jaywink/diaspora-api into contacts

author Marek Marecki <triviuss@gmail.com>

Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)

committer Marek Marecki <triviuss@gmail.com>

Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
author Marek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
committer Marek Marecki <triviuss@gmail.com>
Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
diff --cc diaspy/models.py
Simple merge
diff --cc diaspy/people.py
Simple merge
author	Marek Marecki <triviuss@gmail.com>
	Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
committer	Marek Marecki <triviuss@gmail.com>
	Sun, 30 Jun 2013 22:58:26 +0000 (00:58 +0200)
		1	2
diaspy/models.py	patch \|	diff1 \|	diff2 \|	blob \| history
diaspy/people.py	patch \|	diff1 \|	diff2 \|	blob \| history