Erik Forkalsrud 984bc2f72c Merge branch 'master' of ssh://aha/home/gitroot/album ... Conflicts: src/main/java/org/forkalsrud/album/video/MovieCoder.java		2011-07-03 01:18:19 -07:00
..
main	Merge branch 'master' of ssh://aha/home/gitroot/album	2011-07-03 01:18:19 -07:00
test	The beginning of a filter to patch up the video metadata after the first	2011-07-02 00:58:49 -07:00
ShardulFilter.java	Added photo detail page	2008-11-24 19:54:24 +00:00