]> sjero.net Git - linphone/commitdiff
Merge branch 'sjero' of ssh://server.sjero.net//home/repos/linphone into sjero
authorSamuel Jero <sj323707@ohio.edu>
Wed, 30 Jan 2013 23:06:37 +0000 (18:06 -0500)
committerSamuel Jero <sj323707@ohio.edu>
Wed, 30 Jan 2013 23:06:37 +0000 (18:06 -0500)

Trivial merge